swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-08-01 01:16:03 -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/CentralServer/src/shared/CentralServer.h
+3 -3
View File
@@ -7,7 +7,7 @@
//-----------------------------------------------------------------------
#pragma warning(disable : 4100)
#include <tr1/unordered_map>
#include <unordered_map>
#include <map>
#include <string>
#include <vector>
@@ -61,10 +61,10 @@ public:
private:
typedef std::vector<ConnectionServerConnection *> ConnectionServerConnectionList;
typedef std::map<NetworkId, CentralObject> CentralObjectMap;
typedef std::tr1::unordered_multimap<SceneId, GameServerConnection *> SceneGameMap;
typedef std::unordered_multimap<SceneId, GameServerConnection *> SceneGameMap;
typedef std::pair<SceneGameMap::const_iterator, SceneGameMap::const_iterator> ServersList;
typedef std::tr1::unordered_map<uint32, ConnectionServerConnection *> ConnectionServerSUIDMap;
typedef std::unordered_map<uint32, ConnectionServerConnection *> ConnectionServerSUIDMap;
typedef std::map<NetworkId, std::pair<SceneId, time_t> > PlayerSceneMapType;