mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 01:11:29 +00:00
Compile fixes for linux cpp++11
This commit is contained in:
parent
f3e2af7e42
commit
7f7a4b0f2d
@ -1,6 +1,7 @@
|
||||
#pragma once
|
||||
#include <functional>
|
||||
#include <uv.h>
|
||||
#include <cstring>
|
||||
|
||||
namespace EQ
|
||||
{
|
||||
|
||||
@ -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++;
|
||||
|
||||
@ -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
|
||||
|
||||
@ -48,7 +48,7 @@ ServerManager::ServerManager()
|
||||
server_entity->Reset();
|
||||
}
|
||||
else {
|
||||
world_servers.push_back(std::make_unique<WorldServer>(c));
|
||||
world_servers.push_back(std::unique_ptr<WorldServer>(new WorldServer(c)));
|
||||
}
|
||||
|
||||
});
|
||||
@ -261,4 +261,4 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
|
||||
|
||||
++iter;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user