swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

Removed references to tr1 now that c++11 works

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:28:13 -07:00
parent e6431a9fd4
commit 210bdb91d8
56 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+1 -1
View File
@@ -395,7 +395,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg)
m_suid = atoi(m_accountName.c_str());
if (m_suid == 0)
{
std::tr1::hash<std::string> h;
std::hash<std::string> h;
m_suid = h(m_accountName.c_str());
}
onValidateClient(m_suid, m_accountName, m_isSecure, NULL, ConfigConnectionServer::getDefaultGameFeatures(), ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0, ConfigConnectionServer::getFakeBuddyPoints());
engine/server/application/ConnectionServer/src/shared/ConnectionServer.h
+4 -4
View File
@@ -6,7 +6,7 @@
//-----------------------------------------------------------------------
#include <tr1/unordered_map>
#include <unordered_map>
#include <set>
#include <string>
@@ -40,9 +40,9 @@ class ConnectionServer : public MessageDispatch::Receiver
~ConnectionServer ();
typedef std::tr1::unordered_map<uint32, GameConnection *> GameServerMap;
typedef std::tr1::unordered_map<NetworkId, Client *,NetworkId::Hash> ClientMap;
typedef std::tr1::unordered_map<uint32, ClientConnection *> SuidMap;
typedef std::unordered_map<uint32, GameConnection *> GameServerMap;
typedef std::unordered_map<NetworkId, Client *,NetworkId::Hash> ClientMap;
typedef std::unordered_map<uint32, ClientConnection *> SuidMap;
typedef std::set<uint32> FreeTrialsSet;
static void addNewClient(ClientConnection* cconn, const NetworkId &oid, GameConnection* gconn, const std::string &sceneName, bool sendToStarport );