diff options
Diffstat (limited to 'src/server/shared/Realm/Realm.h')
-rw-r--r-- | src/server/shared/Realm/Realm.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h index 94a752357b2..21675fe149b 100644 --- a/src/server/shared/Realm/Realm.h +++ b/src/server/shared/Realm/Realm.h @@ -19,10 +19,7 @@ #define Realm_h__ #include "Common.h" -#include <boost/asio/ip/address.hpp> -#include <boost/asio/ip/tcp.hpp> - -using namespace boost::asio; +#include "AsioHacksFwd.h" enum RealmFlags { @@ -37,8 +34,6 @@ enum RealmFlags REALM_FLAG_FULL = 0x80 }; -#pragma pack(push, 1) - namespace Battlenet { struct TC_SHARED_API RealmHandle @@ -63,8 +58,6 @@ namespace Battlenet }; } -#pragma pack(pop) - /// Type of server, this is values from second column of Cfg_Configs.dbc enum RealmType { @@ -85,9 +78,9 @@ struct TC_SHARED_API Realm { Battlenet::RealmHandle Id; uint32 Build; - ip::address ExternalAddress; - ip::address LocalAddress; - ip::address LocalSubnetMask; + std::unique_ptr<boost::asio::ip::address> ExternalAddress; + std::unique_ptr<boost::asio::ip::address> LocalAddress; + std::unique_ptr<boost::asio::ip::address> LocalSubnetMask; uint16 Port; std::string Name; uint8 Type; @@ -96,7 +89,7 @@ struct TC_SHARED_API Realm AccountTypes AllowedSecurityLevel; float PopulationLevel; - ip::tcp::endpoint GetAddressForClient(ip::address const& clientAddr) const; + boost::asio::ip::address GetAddressForClient(boost::asio::ip::address const& clientAddr) const; uint32 GetConfigId() const; static uint32 const ConfigIdByType[MAX_CLIENT_REALM_TYPE]; |