Compile fixes for linux cpp++11

This commit is contained in:
Ubuntu
2016-10-30 19:42:28 +00:00
parent f3e2af7e42
commit 7f7a4b0f2d
4 changed files with 5 additions and 4 deletions
+1
View File
@@ -1,6 +1,7 @@
#pragma once
#include <functional>
#include <uv.h>
#include <cstring>
namespace EQ
{
+1 -1
View File
@@ -967,7 +967,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
}
}
else {
if ((size_t)time_since_last_send.count() > std::min(m_resend_delay / (entry.second.times_resent + 1), 5ULL)) {
if ((size_t)time_since_last_send.count() > std::min(m_resend_delay / (entry.second.times_resent + 1), (size_t)5ULL)) {
InternalBufferedSend(entry.second.packet);
entry.second.last_sent = now;
entry.second.times_resent++;
+1 -1
View File
@@ -14,7 +14,7 @@
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include "net\tcp_server.h"
#define INVALID_SOCKET -1
#define SOCKET_ERROR -1
#endif