swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-01 02:15:54 -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/ChatServer/src/shared/ChatServer.h
+7 -7
View File
@@ -11,7 +11,7 @@
#include "ChatAPI/ChatAPI.h"
#include "sharedFoundation/NetworkId.h"
#include "sharedNetworkMessages/ChatAvatarId.h"
#include <tr1/unordered_map>
#include <unordered_map>
#include <map>
#include <set>
#include <string>
@@ -111,7 +111,7 @@ public:
//-----------------------------------------------------------------------
std::tr1::unordered_map<unsigned, NetworkId> pendingRequests;
std::unordered_map<unsigned, NetworkId> pendingRequests;
static ChatServer & instance ();
static bool isValidChatAvatarName(Unicode::String const &chatName);
@@ -225,7 +225,7 @@ private:
time_t chatSpamNextTimeToNotifyPlayerWhenLimited;
time_t unsquelchTime;
};
typedef std::tr1::unordered_map<NetworkId, AvatarExtendedData, NetworkId::Hash> ChatAvatarList;
typedef std::unordered_map<NetworkId, AvatarExtendedData, NetworkId::Hash> ChatAvatarList;
struct VoiceChatAvatarData
@@ -234,7 +234,7 @@ private:
std::string playerName;
};
typedef std::tr1::unordered_map<NetworkId, VoiceChatAvatarData, NetworkId::Hash> VoiceChatAvatarList;
typedef std::unordered_map<NetworkId, VoiceChatAvatarData, NetworkId::Hash> VoiceChatAvatarList;
static AvatarExtendedData * getAvatarExtendedDataByNetworkId(const NetworkId & id);
@@ -243,8 +243,8 @@ private:
ChatAvatarList chatAvatars;
ChatInterface * chatInterface;
VChatInterface * voiceChatInterface;
std::tr1::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash> clientMap;
std::tr1::unordered_map<unsigned int, GameServerConnection *> gameServerConnectionMap;
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash> clientMap;
std::unordered_map<unsigned int, GameServerConnection *> gameServerConnectionMap;
std::set<ConnectionServerConnection *> connectionServerConnections;
bool done;
@@ -255,7 +255,7 @@ private:
static ChatServer * m_instance;
CustomerServiceServerConnection *customerServiceServerConnection;
typedef std::tr1::unordered_map<unsigned int, GameServerConnection *> GameServerMap;
typedef std::unordered_map<unsigned int, GameServerConnection *> GameServerMap;
GameServerMap m_gameServerConnectionRegistry;
VoiceChatAvatarList m_voiceChatIdMap;
std::map<std::string, NetworkId> m_voiceChatNameToIdMap;