pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Compile fixes for linux cpp++11

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/event/event_loop.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <functional> #include <functional>
#include <uv.h> #include <uv.h>
#include <cstring>
namespace EQ namespace EQ
{ {

2
common/net/daybreak_connection.cpp
View File

@ -967,7 +967,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
} }
} }
else { 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); InternalBufferedSend(entry.second.packet);
entry.second.last_sent = now; entry.second.last_sent = now;
entry.second.times_resent++; entry.second.times_resent++;

2
common/tcp_server.cpp
View File

@ -14,7 +14,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "net\tcp_server.h"
#define INVALID_SOCKET -1 #define INVALID_SOCKET -1
#define SOCKET_ERROR -1 #define SOCKET_ERROR -1
#endif #endif

4
loginserver/server_manager.cpp
View File

@ -48,7 +48,7 @@ ServerManager::ServerManager()
server_entity->Reset(); server_entity->Reset();
} }
else { 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; ++iter;
} }
} }