swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -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/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 );