aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-07-20 04:22:20 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-07-20 04:22:20 +0200
commite108478d623e0a54708ab6ce740492062d8abf5b (patch)
tree7f2a50948b3725b54fb155b44a5b75e2ba5534d3 /src
parente68d3b0937e205c94c17d7cb1a53194b6d169fe8 (diff)
Core: Fix non build (gcc)
Diffstat (limited to 'src')
-rw-r--r--src/server/authserver/Realms/RealmList.cpp4
-rw-r--r--src/server/authserver/Server/BattlenetManager.h1
-rw-r--r--src/server/authserver/Server/BattlenetPackets.cpp6
-rw-r--r--src/server/authserver/Server/BattlenetPackets.h6
-rw-r--r--src/server/authserver/Server/BattlenetSession.h2
-rw-r--r--src/server/shared/Cryptography/SHA256.cpp1
6 files changed, 11 insertions, 9 deletions
diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index 519d54c1c59..fe1a43a34c6 100644
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
@@ -22,7 +22,7 @@
#include "Database/DatabaseEnv.h"
#include "Util.h"
-tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
+ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
{
ip::address realmIp;
@@ -51,7 +51,7 @@ tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const
realmIp = ExternalAddress;
}
- tcp::endpoint endpoint(realmIp, port);
+ ip::tcp::endpoint endpoint(realmIp, port);
// Return external IP
return endpoint;
diff --git a/src/server/authserver/Server/BattlenetManager.h b/src/server/authserver/Server/BattlenetManager.h
index adef3b49d13..bd01619ef06 100644
--- a/src/server/authserver/Server/BattlenetManager.h
+++ b/src/server/authserver/Server/BattlenetManager.h
@@ -19,6 +19,7 @@
#define __BATTLENETMANAGER_H__
#include "Define.h"
+#include <cstring>
#include <string>
#include <set>
#include <map>
diff --git a/src/server/authserver/Server/BattlenetPackets.cpp b/src/server/authserver/Server/BattlenetPackets.cpp
index 25a2c6cd9a5..8b3ba06ef0d 100644
--- a/src/server/authserver/Server/BattlenetPackets.cpp
+++ b/src/server/authserver/Server/BattlenetPackets.cpp
@@ -438,7 +438,7 @@ void Battlenet::RealmJoinResult::Write()
}
_stream.Write(IPv4.size(), 5);
- for (ip::tcp::endpoint const& addr : IPv4)
+ for (tcp::endpoint const& addr : IPv4)
{
boost::asio::ip::address_v4::bytes_type ip = addr.address().to_v4().to_bytes();
uint16 port = addr.port();
@@ -454,10 +454,10 @@ std::string Battlenet::RealmJoinResult::ToString() const
{
std::ostringstream stream;
stream << "Battlenet::RealmJoinResult ServerSeed " << ServerSeed << " IPv4 Addresses " << IPv4.size() << " IPv6 Addresses " << IPv6.size();
- for (ip::tcp::endpoint const& addr : IPv4)
+ for (tcp::endpoint const& addr : IPv4)
stream << std::endl << "Battlenet::RealmJoinResult::Address " << boost::lexical_cast<std::string>(addr);
- for (ip::tcp::endpoint const& addr : IPv6)
+ for (tcp::endpoint const& addr : IPv6)
stream << std::endl << "Battlenet::RealmJoinResult::Address " << boost::lexical_cast<std::string>(addr);
return stream.str().c_str();
diff --git a/src/server/authserver/Server/BattlenetPackets.h b/src/server/authserver/Server/BattlenetPackets.h
index 14ec80cdbaa..a85ef7564bf 100644
--- a/src/server/authserver/Server/BattlenetPackets.h
+++ b/src/server/authserver/Server/BattlenetPackets.h
@@ -317,7 +317,7 @@ namespace Battlenet
uint32 Type;
std::string Name;
std::string Version;
- ip::tcp::endpoint Address;
+ tcp::endpoint Address;
uint8 Flags;
uint8 Region;
uint8 Battlegroup;
@@ -363,8 +363,8 @@ namespace Battlenet
std::string ToString() const override;
uint32 ServerSeed;
- std::vector<ip::tcp::endpoint> IPv4;
- std::vector<ip::tcp::endpoint> IPv6;
+ std::vector<tcp::endpoint> IPv4;
+ std::vector<tcp::endpoint> IPv6;
};
}
diff --git a/src/server/authserver/Server/BattlenetSession.h b/src/server/authserver/Server/BattlenetSession.h
index ef3e8ae9214..4c1614cb839 100644
--- a/src/server/authserver/Server/BattlenetSession.h
+++ b/src/server/authserver/Server/BattlenetSession.h
@@ -94,7 +94,7 @@ namespace Battlenet
uint16 GetRemotePort() const { return _socket.remote_endpoint().port(); }
tcp::socket _socket;
- uint8 _readBuffer[BufferSizes::Read];
+ uint8 _readBuffer[size_t(BufferSizes::Read)];
uint32 _accountId;
std::string _accountName;
diff --git a/src/server/shared/Cryptography/SHA256.cpp b/src/server/shared/Cryptography/SHA256.cpp
index b58c7db40c6..c562e90f29f 100644
--- a/src/server/shared/Cryptography/SHA256.cpp
+++ b/src/server/shared/Cryptography/SHA256.cpp
@@ -17,6 +17,7 @@
#include "SHA256.h"
#include "BigNumber.h"
+#include <cstring>
#include <stdarg.h>
SHA256Hash::SHA256Hash()