From 210bdb91d83efc71d57f320711335e12dbc3f165 Mon Sep 17 00:00:00 2001 From: Anonymous Date: Thu, 23 Jan 2014 09:28:13 -0700 Subject: [PATCH] Removed references to tr1 now that c++11 works --- .../CentralServer/src/shared/CentralServer.h | 6 +-- .../ChatServer/src/shared/ChatInterface.cpp | 54 +++++++++---------- .../ChatServer/src/shared/ChatInterface.h | 10 ++-- .../ChatServer/src/shared/ChatServer.cpp | 34 ++++++------ .../ChatServer/src/shared/ChatServer.h | 14 ++--- .../ChatServer/src/shared/FirstChatServer.h | 2 +- .../src/shared/ClientConnection.cpp | 2 +- .../src/shared/ConnectionServer.h | 8 +-- .../CustomerServiceServer/src/linux/main.cpp | 2 +- .../src/shared/FirstCustomerServiceServer.h | 2 +- .../src/shared/ClientConnection.cpp | 2 +- .../LoginServer/src/shared/LoginServer.h | 4 +- .../PlanetServer/src/shared/Scene.h | 10 ++-- .../src/shared/DatabaseProcess.cpp | 10 ++-- .../src/shared/DatabaseProcess.h | 4 +- .../serverDatabase/src/shared/Persister.h | 4 +- .../src/shared/ai/AiMovementSwarm.cpp | 6 +-- .../commoditiesMarket/CommoditiesMarket.cpp | 8 +-- .../console/ConsoleCommandParserDefault.h | 4 +- .../src/shared/core/CharacterMatchManager.cpp | 2 +- .../serverGame/src/shared/core/Client.h | 6 +-- .../src/shared/core/LogoutTracker.cpp | 8 +-- .../src/shared/guild/GuildInterface.cpp | 2 +- .../src/shared/object/CreatureObject.cpp | 2 +- .../src/shared/object/ServerObject.cpp | 4 +- .../src/shared/object/TriggerVolume.cpp | 16 +++--- .../src/shared/object/TriggerVolume.h | 4 +- .../objectTemplate/ServerObjectTemplate.cpp | 4 +- .../src/shared/pvp/PvpUpdateObserver.cpp | 30 +++++------ .../shared/space/SpaceVisibilityManager.cpp | 4 +- .../src/shared/ScriptFunctionTable.h | 4 +- .../src/shared/ScriptMethodsPlayerAccount.cpp | 4 +- .../sharedDebug/src/shared/LeakFinder.h | 4 +- .../sharedFoundation/src/shared/NetworkId.h | 4 +- .../src/shared/StlForwardDeclaration.h | 16 +++--- .../src/shared/combat/CombatDataTable.cpp | 6 +-- .../sharedGame/src/shared/object/Waypoint.cpp | 8 +-- .../src/shared/space/ShipChassisSlotType.cpp | 2 +- .../src/shared/space/ShipComponentType.cpp | 2 +- .../src/shared/PositionVertexIndexer.h | 4 +- .../src/shared/FirstSharedMessageDispatch.h | 2 +- .../src/shared/MessageManager.cpp | 18 +++---- .../sharedNetwork/src/win32/Address.cpp | 2 +- .../src/shared/common/GameNetworkMessage.cpp | 8 +-- .../src/shared/object/NetworkIdManager.cpp | 2 +- .../src/shared/SkillManager.cpp | 2 +- .../sharedUtility/src/shared/DataTable.cpp | 2 +- .../sharedUtility/src/shared/DataTable.h | 4 +- .../src/shared/WorldSnapshotReaderWriter.cpp | 2 +- .../library/platform/utils/Base/linux/Types.h | 6 +-- .../ChatAPI/utils/Base/linux/Types.h | 6 +-- .../src/shared/LocalizationManager.h | 6 +-- .../ours/library/unicode/src/shared/Unicode.h | 5 +- .../src/shared/buffers/IndexedTableBuffer.h | 4 +- .../src/shared/buffers/MarketAuctionsBuffer.h | 10 ++-- .../src/shared/core/ObjvarNameManager.cpp | 2 +- 56 files changed, 198 insertions(+), 205 deletions(-) diff --git a/engine/server/application/CentralServer/src/shared/CentralServer.h b/engine/server/application/CentralServer/src/shared/CentralServer.h index 39b0fc93..d628b2fa 100644 --- a/engine/server/application/CentralServer/src/shared/CentralServer.h +++ b/engine/server/application/CentralServer/src/shared/CentralServer.h @@ -7,7 +7,7 @@ //----------------------------------------------------------------------- #pragma warning(disable : 4100) -#include +#include #include #include #include @@ -61,10 +61,10 @@ public: private: typedef std::vector ConnectionServerConnectionList; typedef std::map CentralObjectMap; - typedef std::tr1::unordered_multimap SceneGameMap; + typedef std::unordered_multimap SceneGameMap; typedef std::pair ServersList; - typedef std::tr1::unordered_map ConnectionServerSUIDMap; + typedef std::unordered_map ConnectionServerSUIDMap; typedef std::map > PlayerSceneMapType; diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp index 1f23c456..a25d2c54 100644 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.cpp @@ -89,7 +89,7 @@ namespace ChatInterfaceNamespace static int s_maxHeadersToSendToClientPerInterval; // to prevent sending duplicate room chat message - std::tr1::unordered_map > s_mostRecentRoomChatMessage; + std::unordered_map > s_mostRecentRoomChatMessage; } using namespace ChatInterfaceNamespace; @@ -356,7 +356,7 @@ void ChatInterface::OnGetRoom(unsigned track, unsigned result, const ChatRoom *r } std::string lowerRoomName = toLower(roomName); unsigned sequence = (unsigned)user; - std::tr1::unordered_map::iterator f = roomList.find(lowerRoomName); + std::unordered_map::iterator f = roomList.find(lowerRoomName); if (f != roomList.end() && room) { (*f).second.updateRoomData(room); @@ -443,7 +443,7 @@ const ChatServerRoomOwner * ChatInterface::getRoomByName(const std::string & roo std::string lowerRoomName = toLower(roomName); const ChatServerRoomOwner * result = 0; - std::tr1::unordered_map::const_iterator f = roomList.find(lowerRoomName); + std::unordered_map::const_iterator f = roomList.find(lowerRoomName); if(f != roomList.end()) { result = &(*f).second; @@ -546,7 +546,7 @@ void ChatInterface::sendMessageToAllAvatars(const GameNetworkMessage & message) } //send to all pending avatars - std::tr1::unordered_map::iterator p = pendingAvatars.begin(); + std::unordered_map::iterator p = pendingAvatars.begin(); while (p != pendingAvatars.end()) { ConnectionServerConnection * connection = @@ -570,7 +570,7 @@ std::string ChatInterface::getChatName(const NetworkId &id) { ChatServer::fileLog(false, "ChatInterface", "getChatName() id(%s)", id.getValueString().c_str()); - std::tr1::unordered_map::iterator i; + std::unordered_map::iterator i; for (i = pendingAvatars.begin(); i != pendingAvatars.end(); ++i) { if (id == (*i).second) @@ -588,7 +588,7 @@ bool ChatInterface::sendMessageToPendingAvatar(const ChatAvatarId &id, const Gam { ChatServer::fileLog(false, "ChatInterface", "sendMessageToPendingAvatar() id(%s) message(%s)", id.getFullName().c_str(), message.getCmdName().c_str()); - std::tr1::unordered_map::iterator f = pendingAvatars.find(id.name); + std::unordered_map::iterator f = pendingAvatars.find(id.name); if (f != pendingAvatars.end()) { ConnectionServerConnection * connection = @@ -609,7 +609,7 @@ bool ChatInterface::sendMessageToPendingAvatar(const ChatAvatarId &id, const Gam //----------------------------------------------------------------------- -const std::tr1::unordered_map & ChatInterface::getRoomList() const +const std::unordered_map & ChatInterface::getRoomList() const { return roomList; } @@ -618,7 +618,7 @@ const std::tr1::unordered_map & ChatInterface: void ChatInterface::updateRooms() { - std::tr1::unordered_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = roomList.begin(); i != roomList.end(); ++i) { ChatServerRoomOwner & roomOwner = const_cast((*i).second); @@ -656,7 +656,7 @@ void ChatInterface::requestRoomList(const NetworkId & id, ConnectionServerConnec ++roomQueriesThisFrame; - std::tr1::unordered_map::const_iterator i; + std::unordered_map::const_iterator i; std::vector rooms; const ChatAvatar * target = ChatServer::getAvatarByNetworkId(id); ChatAvatarId requestingAvatar; @@ -1010,7 +1010,7 @@ void ChatInterface::OnReceiveAddModeratorRoom(const ChatAvatar *srcAvatar, const makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -1123,7 +1123,7 @@ void ChatInterface::OnReceiveRemoveModeratorRoom(const ChatAvatar *srcAvatar, co makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -1473,7 +1473,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva ChatAvatarId failedAvatarId; makeAvatarId(ChatUnicodeString(info->name.data(), info->name.size()), ChatUnicodeString(info->address.data(), info->address.size()), failedAvatarId); - std::tr1::unordered_map::iterator f = pendingAvatars.find(failedAvatarId.name); + std::unordered_map::iterator f = pendingAvatars.find(failedAvatarId.name); if (f != pendingAvatars.end()) { pendingAvatars.erase(f); @@ -1511,7 +1511,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva else { // look up a connection for this avatar - std::tr1::unordered_map::iterator f = pendingAvatars.find(id.name); + std::unordered_map::iterator f = pendingAvatars.find(id.name); if(f != pendingAvatars.end()) { GenericValueTypeMessage const avatarConnectedMessage("ChatAvatarConnected", (*f).second); @@ -1536,7 +1536,7 @@ void ChatInterface::OnLoginAvatar(unsigned track, unsigned result, const ChatAva ChatServer::chatConnectedAvatar((*f).second, *newAvatar); // flush chat messages pending for this avatar - std::tr1::unordered_map, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second); + std::unordered_map, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second); if(df != deferredChatMessages.end()) { std::vector & v = (*df).second; @@ -1642,7 +1642,7 @@ void ChatInterface::OnGetRoomSummaries(unsigned track, unsigned result, unsigned makeRoomName(&(foundRooms[i]), roomName); std::string lowerRoomName = toLower(roomName); - std::tr1::unordered_map::const_iterator f = roomList.find(lowerRoomName); + std::unordered_map::const_iterator f = roomList.find(lowerRoomName); if(f == roomList.end()) { RequestGetRoom(foundRooms[i].getRoomAddress(), NULL); @@ -1660,7 +1660,7 @@ void ChatInterface::OnGetRoomSummaries(unsigned track, unsigned result, unsigned const ChatServerRoomOwner *ChatInterface::getRoomOwner(const std::string & roomName) { std::string lowerName = toLower(roomName); - std::tr1::unordered_map::const_iterator f = roomList.find(lowerName); + std::unordered_map::const_iterator f = roomList.find(lowerName); if(f != roomList.end()) { return &((*f).second); @@ -1672,7 +1672,7 @@ const ChatServerRoomOwner *ChatInterface::getRoomOwner(const std::string & roomN ChatServerRoomOwner *ChatInterface::getRoomOwner(unsigned roomId) { - std::tr1::unordered_map::iterator f = roomList.begin(); + std::unordered_map::iterator f = roomList.begin(); while (f != roomList.end()) { if ((*f).second.getRoomData().id == roomId) @@ -1709,7 +1709,7 @@ void ChatInterface::OnReceiveDestroyRoom(const ChatAvatar *srcAvatar, const Chat std::string roomName; makeRoomName(destRoom, roomName); std::string lowerName = toLower(roomName); - std::tr1::unordered_map::iterator f = roomList.find(lowerName); + std::unordered_map::iterator f = roomList.find(lowerName); if(f != roomList.end()) { roomList.erase(f); @@ -1753,7 +1753,7 @@ void ChatInterface::OnDestroyRoom(unsigned track, unsigned result, void *user) if (result == CHATRESULT_SUCCESS) { std::string lowerName = toLower(owner->getRoomData().path); - std::tr1::unordered_map::iterator f = roomList.find(lowerName); + std::unordered_map::iterator f = roomList.find(lowerName); if(f != roomList.end()) { roomList.erase(f); @@ -1985,7 +1985,7 @@ void ChatInterface::OnReceiveEnterRoom(const ChatAvatar *srcAvatar, const ChatRo makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2182,7 +2182,7 @@ void ChatInterface::OnReceiveAddBanRoom(const ChatAvatar *srcAvatar, const ChatA makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2300,7 +2300,7 @@ void ChatInterface::OnReceiveRemoveBanRoom(const ChatAvatar *srcAvatar, const Ch makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2419,7 +2419,7 @@ void ChatInterface::OnReceiveAddInviteRoom(const ChatAvatar *srcAvatar, const Ch makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2518,7 +2518,7 @@ void ChatInterface::OnReceiveRemoveInviteRoom(const ChatAvatar *srcAvatar, const makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2599,7 +2599,7 @@ void ChatInterface::OnReceiveLeaveRoom(const ChatAvatar *srcAvatar, const ChatRo makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator const f = roomList.find(toLower(roomName)); + std::unordered_map::iterator const f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2719,7 +2719,7 @@ void ChatInterface::OnReceiveKickRoom(const ChatAvatar *srcAvatar, const ChatAva makeRoomName(destRoom, roomName); // Update info about the room - std::tr1::unordered_map::iterator f = roomList.find(toLower(roomName)); + std::unordered_map::iterator f = roomList.find(toLower(roomName)); if(f != roomList.end()) (*f).second.updateRoomData(destRoom); @@ -2940,7 +2940,7 @@ void ChatInterface::OnReceiveRoomMessage(const ChatAvatar *srcAvatar, const Chat { unsigned const destAvatarId = destAvatar->getAvatarID(); unsigned const destRoomId = destRoom->getRoomID(); - std::tr1::unordered_map >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId); + std::unordered_map >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId); if (iterFind != s_mostRecentRoomChatMessage.end()) { if ((iterFind->second.first == destRoomId) && (iterFind->second.second == messageID)) diff --git a/engine/server/application/ChatServer/src/shared/ChatInterface.h b/engine/server/application/ChatServer/src/shared/ChatInterface.h index 65403040..a42a6ecf 100644 --- a/engine/server/application/ChatServer/src/shared/ChatInterface.h +++ b/engine/server/application/ChatServer/src/shared/ChatInterface.h @@ -12,7 +12,7 @@ #include "ChatServerAvatarOwner.h" #include "ChatServerRoomOwner.h" #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ public: const NetworkId & getNetworkIdByAvatarId(const ChatAvatarId &id); ChatServerAvatarOwner *getAvatarOwner(const ChatAvatar *avatar); void disconnectPlayer (const ChatAvatarId & avatarId); - const std::tr1::unordered_map & getRoomList () const; + const std::unordered_map & getRoomList () const; const ChatServerRoomOwner *getRoomOwner(const std::string &roomName); ChatServerRoomOwner *getRoomOwner(unsigned roomId); @@ -157,11 +157,11 @@ public: private: std::map avatarMap; - std::tr1::unordered_map pendingAvatars; + std::unordered_map pendingAvatars; std::set pendingRoomQueries; int roomQueriesThisFrame; - std::tr1::unordered_map roomList; - std::tr1::unordered_map, NetworkId::Hash > deferredChatMessages; + std::unordered_map roomList; + std::unordered_map, NetworkId::Hash > deferredChatMessages; std::map > > queuedHeaders; std::map, int> > trackingRequestGetAnyAvatarForDestroy; }; diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.cpp b/engine/server/application/ChatServer/src/shared/ChatServer.cpp index 7361930b..d4752eda 100644 --- a/engine/server/application/ChatServer/src/shared/ChatServer.cpp +++ b/engine/server/application/ChatServer/src/shared/ChatServer.cpp @@ -71,7 +71,7 @@ namespace ChatServerNamespace ChatServerMetricsData * s_chatServerMetricsData = 0; typedef std::list > MessageList; - typedef std::tr1::unordered_map PlayerMessageList; + typedef std::unordered_map PlayerMessageList; PlayerMessageList s_playerMessageList; void cleanChatLog(); @@ -430,7 +430,7 @@ void ChatServer::sendToClient(const NetworkId & id, const GameNetworkMessage & m { ChatServer::fileLog(false, "ChatServer", "sendToClient() id(%s) message(%s)", id.getValueString().c_str(), message.getCmdName().c_str()); - std::tr1::unordered_map::const_iterator f = instance().clientMap.find(id); + std::unordered_map::const_iterator f = instance().clientMap.find(id); if(f != instance().clientMap.end()) { (*f).second->sendToClient(id, message); @@ -604,7 +604,7 @@ void ChatServer::removeServices() ChatAvatarId ChatServer::getAvatarIdForTrackId(unsigned trackId) { ChatServer & server = instance(); - std::tr1::unordered_map::iterator f = server.pendingRequests.find(trackId); + std::unordered_map::iterator f = server.pendingRequests.find(trackId); if(f != server.pendingRequests.end()) { const ChatAvatar *avatar = getAvatarByNetworkId((*f).second); @@ -681,11 +681,11 @@ NetworkId ChatServer::sendResponseForTrackId(unsigned trackId, const GameNetwork { NetworkId id; ChatServer & server = instance(); - std::tr1::unordered_map::iterator f = server.pendingRequests.find(trackId); + std::unordered_map::iterator f = server.pendingRequests.find(trackId); if(f != server.pendingRequests.end()) { id = (*f).second; - std::tr1::unordered_map::const_iterator c = server.clientMap.find((*f).second); + std::unordered_map::const_iterator c = server.clientMap.find((*f).second); if(c != server.clientMap.end()) { ConnectionServerConnection * conn = (*c).second; @@ -701,7 +701,7 @@ NetworkId ChatServer::sendResponseForTrackId(unsigned trackId, const GameNetwork GameServerConnection *ChatServer::getGameServerConnection(unsigned int sequence) { GameServerConnection * result = 0; - std::tr1::unordered_map::iterator f = instance().gameServerConnectionMap.find(sequence); + std::unordered_map::iterator f = instance().gameServerConnectionMap.find(sequence); if(f != instance().gameServerConnectionMap.end()) { result = (*f).second; @@ -724,7 +724,7 @@ void ChatServer::addGameServerConnection(unsigned int sequence, GameServerConnec void ChatServer::clearGameServerConnection(const GameServerConnection *connection) { std::vector removeKeyList; - std::tr1::unordered_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = instance().gameServerConnectionMap.begin(); i != instance().gameServerConnectionMap.end(); ++i) { if ((*i).second == connection) @@ -746,7 +746,7 @@ void ChatServer::clearGameServerConnection(const GameServerConnection *connectio ConnectionServerConnection * ChatServer::getConnectionForCharacter(const NetworkId & characterId) { ConnectionServerConnection * result = 0; - std::tr1::unordered_map::iterator f = instance().clientMap.find(characterId); + std::unordered_map::iterator f = instance().clientMap.find(characterId); if(f != instance().clientMap.end()) { result = (*f).second; @@ -1039,7 +1039,7 @@ void ChatServer::connectPlayer(ConnectionServerConnection * connection, const un { ChatServer::fileLog(false, "ChatServer", "connectPlayer() address(%s) suid(%u) characterName(%s) networkId(%s)", getConnectionAddress(connection).c_str(), suid, characterName.c_str(), networkId.getValueString().c_str()); - std::tr1::unordered_map::iterator cf = instance().clientMap.find(networkId); + std::unordered_map::iterator cf = instance().clientMap.find(networkId); if (cf != instance().clientMap.end()) { DEBUG_WARNING(true, ("We received a chat login attempt for a player (%s) that we think is already logged in. We're going to try to log out the old avatar then log in the new one.", characterName.c_str())); @@ -1260,7 +1260,7 @@ void ChatServer::destroyRoom(const NetworkId & id, const unsigned int sequence, ChatAvatarId destroyer(avatar->GetGameCode(), avatar->GetGameServerName(), avatar->GetCharacterName()); // can this avatar destroy the room? - std::tr1::unordered_map::const_iterator i; + std::unordered_map::const_iterator i; for(i = instance().chatInterface->getRoomList().begin(); i != instance().chatInterface->getRoomList().end(); ++i) { if((*i).second.getRoomData().id == roomId) @@ -1373,7 +1373,7 @@ void ChatServer::disconnectPlayer(const NetworkId & id) instance().chatAvatars.erase(f); } - std::tr1::unordered_map::iterator cf = instance().clientMap.find(id); + std::unordered_map::iterator cf = instance().clientMap.find(id); if(cf != instance().clientMap.end()) { instance().clientMap.erase(cf); @@ -2268,7 +2268,7 @@ void ChatServer::sendRoomMessage(const ChatAvatarId &id, const std::string & roo } // get room id std::string lowerName = toLower(roomName); - std::tr1::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); + std::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); if(f != instance().chatInterface->getRoomList().end()) { const ChatAvatar *sender = instance().ownerSystem; @@ -2386,7 +2386,7 @@ void ChatServer::sendStandardRoomMessage(const ChatAvatarId &senderId, const std return; } - std::tr1::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); + std::unordered_map::const_iterator f = instance().chatInterface->getRoomList().find(lowerName); if(f != instance().chatInterface->getRoomList().end()) { const ChatAvatar *sender; @@ -2457,13 +2457,13 @@ void ChatServer::removeConnectionServerConnection(ConnectionServerConnection * t { ChatServer::fileLog(false, "ChatServer", "removeConnectionServerConnection() target(%s)", getConnectionAddress(target).c_str()); - std::tr1::unordered_map tmpList = instance().clientMap; - std::tr1::unordered_map::const_iterator i; + std::unordered_map tmpList = instance().clientMap; + std::unordered_map::const_iterator i; for(i = tmpList.begin(); i != tmpList.end(); ++i) { if((*i).second == target) disconnectPlayer((*i).first); - std::tr1::unordered_map::iterator f = instance().clientMap.find((*i).first); + std::unordered_map::iterator f = instance().clientMap.find((*i).first); if (f != instance().clientMap.end()) { instance().clientMap.erase(f); @@ -2913,7 +2913,7 @@ void ChatServer::sendToGameServerById(unsigned const connectionId, GameNetworkMe GameServerConnection *ChatServer::getGameServerConnectionFromId(unsigned int sequence) { GameServerConnection * result = NULL; - std::tr1::unordered_map::iterator f = m_gameServerConnectionRegistry.find(sequence); + std::unordered_map::iterator f = m_gameServerConnectionRegistry.find(sequence); if(f != m_gameServerConnectionRegistry.end()) { result = (*f).second; diff --git a/engine/server/application/ChatServer/src/shared/ChatServer.h b/engine/server/application/ChatServer/src/shared/ChatServer.h index 017773a3..0baf6191 100644 --- a/engine/server/application/ChatServer/src/shared/ChatServer.h +++ b/engine/server/application/ChatServer/src/shared/ChatServer.h @@ -11,7 +11,7 @@ #include "ChatAPI/ChatAPI.h" #include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/ChatAvatarId.h" -#include +#include #include #include #include @@ -111,7 +111,7 @@ public: //----------------------------------------------------------------------- - std::tr1::unordered_map pendingRequests; + std::unordered_map 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 ChatAvatarList; + typedef std::unordered_map ChatAvatarList; struct VoiceChatAvatarData @@ -234,7 +234,7 @@ private: std::string playerName; }; - typedef std::tr1::unordered_map VoiceChatAvatarList; + typedef std::unordered_map VoiceChatAvatarList; static AvatarExtendedData * getAvatarExtendedDataByNetworkId(const NetworkId & id); @@ -243,8 +243,8 @@ private: ChatAvatarList chatAvatars; ChatInterface * chatInterface; VChatInterface * voiceChatInterface; - std::tr1::unordered_map clientMap; - std::tr1::unordered_map gameServerConnectionMap; + std::unordered_map clientMap; + std::unordered_map gameServerConnectionMap; std::set connectionServerConnections; bool done; @@ -255,7 +255,7 @@ private: static ChatServer * m_instance; CustomerServiceServerConnection *customerServiceServerConnection; - typedef std::tr1::unordered_map GameServerMap; + typedef std::unordered_map GameServerMap; GameServerMap m_gameServerConnectionRegistry; VoiceChatAvatarList m_voiceChatIdMap; std::map m_voiceChatNameToIdMap; diff --git a/engine/server/application/ChatServer/src/shared/FirstChatServer.h b/engine/server/application/ChatServer/src/shared/FirstChatServer.h index c68be87c..697a186c 100644 --- a/engine/server/application/ChatServer/src/shared/FirstChatServer.h +++ b/engine/server/application/ChatServer/src/shared/FirstChatServer.h @@ -27,7 +27,7 @@ namespace Archive #include "sharedFoundation/NetworkId.h" #include "sharedNetwork/Connection.h" #include "ChatAPI/ChatAPI.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 7f1cce1a..892937fb 100644 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -395,7 +395,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg& msg) m_suid = atoi(m_accountName.c_str()); if (m_suid == 0) { - std::tr1::hash h; + std::hash 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()); diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h index 7a18e783..36abc449 100644 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h @@ -6,7 +6,7 @@ //----------------------------------------------------------------------- -#include +#include #include #include @@ -40,9 +40,9 @@ class ConnectionServer : public MessageDispatch::Receiver ~ConnectionServer (); - typedef std::tr1::unordered_map GameServerMap; - typedef std::tr1::unordered_map ClientMap; - typedef std::tr1::unordered_map SuidMap; + typedef std::unordered_map GameServerMap; + typedef std::unordered_map ClientMap; + typedef std::unordered_map SuidMap; typedef std::set FreeTrialsSet; static void addNewClient(ClientConnection* cconn, const NetworkId &oid, GameConnection* gconn, const std::string &sceneName, bool sendToStarport ); diff --git a/engine/server/application/CustomerServiceServer/src/linux/main.cpp b/engine/server/application/CustomerServiceServer/src/linux/main.cpp index 5c5d7660..7cdc4016 100644 --- a/engine/server/application/CustomerServiceServer/src/linux/main.cpp +++ b/engine/server/application/CustomerServiceServer/src/linux/main.cpp @@ -12,7 +12,7 @@ #include "sharedNetworkMessages/SetupSharedNetworkMessages.h" #include "sharedRandom/SetupSharedRandom.h" #include "sharedThread/SetupSharedThread.h" -#include +#include // ====================================================================== diff --git a/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h b/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h index 2937cec5..4eaa6a3b 100644 --- a/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h +++ b/engine/server/application/CustomerServiceServer/src/shared/FirstCustomerServiceServer.h @@ -12,7 +12,7 @@ #include "sharedFoundation/FirstSharedFoundation.h" #include "sharedFoundation/NetworkId.h" #include "sharedNetwork/Connection.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index 7430d23e..087796db 100644 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -196,7 +196,7 @@ void ClientConnection::validateClient(const std::string & id, const std::string if (suid==0) { - std::tr1::hash h; + std::hash h; suid = h(id); //lint !e603 // Symbol 'h' not initialized (it's a functor) } diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.h b/engine/server/application/LoginServer/src/shared/LoginServer.h index 2d9456ef..a284068e 100644 --- a/engine/server/application/LoginServer/src/shared/LoginServer.h +++ b/engine/server/application/LoginServer/src/shared/LoginServer.h @@ -12,7 +12,7 @@ #include "sharedFoundation/StationId.h" #include "sharedMessageDispatch/Receiver.h" #include "sharedNetwork/Service.h" -#include +#include #include #include @@ -43,7 +43,7 @@ public: ClientConnection* getUnvalidatedClient (int clientId); void removeClient (int clientId); - const std::tr1::unordered_map & getCentralServerMap_hide() const; + const std::unordered_map & getCentralServerMap_hide() const; bool deleteCharacter (uint32 clusterId, NetworkId const & characterId, StationId suid); diff --git a/engine/server/application/PlanetServer/src/shared/Scene.h b/engine/server/application/PlanetServer/src/shared/Scene.h index 24bfbdd8..5c36369f 100644 --- a/engine/server/application/PlanetServer/src/shared/Scene.h +++ b/engine/server/application/PlanetServer/src/shared/Scene.h @@ -10,8 +10,8 @@ // ====================================================================== -#include -#include +#include +#include #include #include @@ -93,9 +93,9 @@ class Scene : public Singleton2, public MessageDispatch::Receiver Coordinates(); }; - typedef std::tr1::unordered_map ObjectMapType; - typedef std::tr1::unordered_set DeletedSetType; - typedef std::tr1::unordered_map NodeMapType; + typedef std::unordered_map ObjectMapType; + typedef std::unordered_set DeletedSetType; + typedef std::unordered_map NodeMapType; private: std::string m_sceneId; diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 8435b366..9353e2d9 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -369,7 +369,7 @@ void DatabaseProcess::connectToGameServer(const char *address, uint16 port, uint if(i == pendingGameServerConnections.end()) { // check to see if there is already a connection active - std::tr1::unordered_map::const_iterator j = gameServerConnections.find(processId); + std::unordered_map::const_iterator j = gameServerConnections.find(processId); if(j == gameServerConnections.end()) { // make the connection @@ -383,7 +383,7 @@ void DatabaseProcess::connectToGameServer(const char *address, uint16 port, uint GameServerConnection * DatabaseProcess::getConnectionByProcess(const uint32 processId) { GameServerConnection * result = 0; - std::tr1::unordered_map::const_iterator j = gameServerConnections.find(processId); + std::unordered_map::const_iterator j = gameServerConnections.find(processId); if(j != gameServerConnections.end()) { result = (*j).second; @@ -395,7 +395,7 @@ GameServerConnection * DatabaseProcess::getConnectionByProcess(const uint32 proc void DatabaseProcess::getGameServerProcessIds(std::vector &processIds) const { - for (std::tr1::unordered_map::const_iterator i = gameServerConnections.begin(); i != gameServerConnections.end(); ++i) + for (std::unordered_map::const_iterator i = gameServerConnections.begin(); i != gameServerConnections.end(); ++i) processIds.push_back((*i).first); } @@ -637,7 +637,7 @@ void DatabaseProcess::sendToCommoditiesServer(GameNetworkMessage const &message, void DatabaseProcess::sendToAllGameServers(GameNetworkMessage const &message, bool reliable) { - for (std::tr1::unordered_map::const_iterator i=gameServerConnections.begin(); i!=gameServerConnections.end(); ++i) + for (std::unordered_map::const_iterator i=gameServerConnections.begin(); i!=gameServerConnections.end(); ++i) i->second->send(message,reliable); } @@ -645,7 +645,7 @@ void DatabaseProcess::sendToAllGameServers(GameNetworkMessage const &message, bo void DatabaseProcess::sendToGameServer(uint32 serverId, GameNetworkMessage const &message) { - std::tr1::unordered_map::const_iterator i=gameServerConnections.find(serverId); + std::unordered_map::const_iterator i=gameServerConnections.find(serverId); if (i!=gameServerConnections.end()) i->second->send(message,true); else diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h index af47fb5b..5cc5f2e7 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h @@ -10,7 +10,7 @@ // ====================================================================== -#include +#include #include #include #include "sharedFoundation/NetworkIdArchive.h" @@ -88,7 +88,7 @@ class DatabaseProcess : public MessageDispatch::Receiver CommoditiesServerConnection * commoditiesConnection; DatabaseMetricsData * m_metricsData; - std::tr1::unordered_map gameServerConnections; + std::unordered_map gameServerConnections; std::set > pendingGameServerConnections; int m_queryExecCount; diff --git a/engine/server/library/serverDatabase/src/shared/Persister.h b/engine/server/library/serverDatabase/src/shared/Persister.h index 0b6dd8c8..3c432fbc 100644 --- a/engine/server/library/serverDatabase/src/shared/Persister.h +++ b/engine/server/library/serverDatabase/src/shared/Persister.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include //TODO: remove when we clean up newCharacterLock hack @@ -105,7 +105,7 @@ class Persister : public MessageDispatch::Receiver }; typedef std::map ServerSnapshotMap; - typedef std::tr1::unordered_map ObjectSnapshotMap; + typedef std::unordered_map ObjectSnapshotMap; typedef std::map PendingCharactersType; typedef std::vector SnapshotListType; typedef std::set NewCharacterLockType; diff --git a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp index 74bb6b93..52a3e701 100644 --- a/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp +++ b/engine/server/library/serverGame/src/shared/ai/AiMovementSwarm.cpp @@ -18,15 +18,15 @@ #include "sharedLog/Log.h" #include "sharedObject/World.h" -#include +#include using namespace Scripting; namespace AiMovementSwarmNamespace { - typedef std::tr1::unordered_map, CachedNetworkId> targetMap; - typedef std::tr1::unordered_map offsetMap; + typedef std::unordered_map, CachedNetworkId> targetMap; + typedef std::unordered_map offsetMap; // map of swarm targets to the creatures swarming them targetMap s_swarmMap; diff --git a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp index 630df29a..63fc08ef 100644 --- a/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp +++ b/engine/server/library/serverGame/src/shared/commoditiesMarket/CommoditiesMarket.cpp @@ -590,8 +590,8 @@ static time_t s_timeMarketConnectionCre static std::map > s_queries; static std::map s_queryTime; static int s_nextRequestId; -static std::tr1::unordered_map s_pendingLoads; -static std::tr1::unordered_map s_pendingAdds; //sequence to cost map +static std::unordered_map s_pendingLoads; +static std::unordered_map s_pendingAdds; //sequence to cost map // all money transactions transfer money out of or to the bank of the player and never to or from the vendor/bazaar location except bazaar sale fees static const std::string COMMODITIES_NAMED_ACCOUNT("commodities_named_escrow_account"); @@ -1321,7 +1321,7 @@ void CommoditiesMarket::onAddAuction(int sequence, int32 result, const NetworkId } } } - std::tr1::unordered_map::iterator f = s_pendingAdds.find(sequence); + std::unordered_map::iterator f = s_pendingAdds.find(sequence); int auctionFee = 0; if (f != s_pendingAdds.end()) { @@ -2488,7 +2488,7 @@ void CommoditiesMarket::checkPendingLoads(const NetworkId &itemId) if (!ConfigServerGame::getCommoditiesMarketEnabled()) return; LOG("AuctionRetrieval", ("CommoditiesMarket::response from DB for loading object %s for retrieval", itemId.getValueString().c_str())); - std::tr1::unordered_map::iterator f = s_pendingLoads.find(itemId); + std::unordered_map::iterator f = s_pendingLoads.find(itemId); if (f != s_pendingLoads.end()) { CreatureObject *player = dynamic_cast(NetworkIdManager::getObjectById((*f).second.ownerId)); diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h index a1d859eb..08944f7c 100644 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserDefault.h @@ -10,7 +10,7 @@ #include "sharedCommandParser/CommandParser.h" #include -#include +#include #include "UnicodeUtils.h" // ====================================================================== @@ -18,7 +18,7 @@ class ConsoleCommandParserDefault : public CommandParser { public: typedef std::map AliasMap_t; - typedef std::tr1::unordered_set AliasGuardSet_t; + typedef std::unordered_set AliasGuardSet_t; explicit ConsoleCommandParserDefault (void); diff --git a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp index 2d4786e9..ce305b38 100644 --- a/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/CharacterMatchManager.cpp @@ -33,7 +33,7 @@ #include "sharedObject/NetworkIdManager.h" #include "sharedSkillSystem/SkillManager.h" #include "sharedSkillSystem/SkillObject.h" -#include +#include #include #include #include diff --git a/engine/server/library/serverGame/src/shared/core/Client.h b/engine/server/library/serverGame/src/shared/core/Client.h index 4907e4d9..9ed69e72 100644 --- a/engine/server/library/serverGame/src/shared/core/Client.h +++ b/engine/server/library/serverGame/src/shared/core/Client.h @@ -19,7 +19,7 @@ #include "sharedObject/CachedNetworkId.h" #include "sharedObject/Object.h" #include "unicodeArchive/UnicodeArchive.h" -#include +#include #include class ConnectionServerConnection; @@ -128,12 +128,12 @@ public: return (reinterpret_cast(ptr) >> 4); }; }; - typedef std::tr1::unordered_set ObservingList; + typedef std::unordered_set ObservingList; // objects being observed that are in this list needs // to have their pvp status updated when there are changes // that requires pvp status to be recalcuclated - typedef std::tr1::unordered_set ObservingListPvpSync; + typedef std::unordered_set ObservingListPvpSync; ObservingList const & getObserving() const; ObservingListPvpSync const & getObservingPvpSync() const; diff --git a/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp index e74a4322..77454c88 100644 --- a/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp +++ b/engine/server/library/serverGame/src/shared/core/LogoutTracker.cpp @@ -25,14 +25,14 @@ #include "sharedObject/Container.h" #include #include -#include +#include // ====================================================================== static bool s_installed; static Scheduler *s_logoutTrackerScheduler; static std::queue s_logoutCallbacks; -static std::tr1::unordered_map s_logoutCallbacksCount; +static std::unordered_map s_logoutCallbacksCount; namespace LogoutTrackerNamespace { @@ -76,7 +76,7 @@ void LogoutTracker::add(NetworkId const &networkId) // when they go off, and only when the last 3 minute timer goes off do we remove him from the // world, which is the desired behavior of leaving a disconnected character in the world for // 3 minutes before removing him from the world - std::tr1::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); + std::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); if (iter == s_logoutCallbacksCount.end()) { s_logoutCallbacksCount[networkId] = 1; @@ -97,7 +97,7 @@ void LogoutTracker::handleLogoutCallback(const void *context) UNREF(context); NetworkId const &networkId = s_logoutCallbacks.front(); - std::tr1::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); + std::unordered_map::iterator iter = s_logoutCallbacksCount.find(networkId); // only process the *LAST* logout callback that is put into the logout callback // queue for this object as the previous ones are no longer applicable diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp index 6282ec5a..f30669aa 100644 --- a/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp +++ b/engine/server/library/serverGame/src/shared/guild/GuildInterface.cpp @@ -23,7 +23,7 @@ #include "sharedFoundation/FormattedString.h" #include "sharedNetworkMessages/ChatRoomData.h" -#include +#include // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp index a776bc89..ca6568c2 100644 --- a/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/CreatureObject.cpp @@ -183,7 +183,7 @@ #include #include #include -#include +#include #include //---------------------------------------------------------------------- diff --git a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp index b7cf15c6..2ca0fa23 100644 --- a/engine/server/library/serverGame/src/shared/object/ServerObject.cpp +++ b/engine/server/library/serverGame/src/shared/object/ServerObject.cpp @@ -8393,11 +8393,11 @@ void ServerObject::stopListeningToAllBroadcastMessages() else { // build list of all broadcasters this object is currently listening to - std::tr1::unordered_set broadcasters; + std::unordered_set broadcasters; for (BroadcastMap::const_iterator iter = m_broadcastBroadcasters.begin(); iter != m_broadcastBroadcasters.end(); ++iter) IGNORE_RETURN(broadcasters.insert(iter->second)); - for (std::tr1::unordered_set::const_iterator iter2 = broadcasters.begin(); iter2 != broadcasters.end(); ++iter2) + for (std::unordered_set::const_iterator iter2 = broadcasters.begin(); iter2 != broadcasters.end(); ++iter2) { // need to send a message to the broadcaster if the broadcaster is not on this game server ServerObject * objBroadcaster = ServerWorld::findObjectByNetworkId(*iter2); diff --git a/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp b/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp index 2492a844..71610de2 100644 --- a/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp +++ b/engine/server/library/serverGame/src/shared/object/TriggerVolume.cpp @@ -18,7 +18,7 @@ #include "sharedDebug/Profiler.h" #include "sharedObject/NetworkIdManager.h" #include -#include +#include // ====================================================================== @@ -48,8 +48,8 @@ namespace TriggerVolumeNamespace // optimization to track how many time a NetworkId appears // in sources and targets, so that we can avoid unnecessarily // searching the entire sources and targets vectors - std::tr1::unordered_map m_sourcesCount; - std::tr1::unordered_map m_targetsCount; + std::unordered_map m_sourcesCount; + std::unordered_map m_targetsCount; }; // ---------------------------------------------------------------------- @@ -61,7 +61,7 @@ namespace TriggerVolumeNamespace m_sources.push_back(source); m_targets.push_back(target); - std::tr1::unordered_map::iterator i = m_sourcesCount.find(source); + std::unordered_map::iterator i = m_sourcesCount.find(source); if (i == m_sourcesCount.end()) m_sourcesCount[source] = 1; else @@ -80,7 +80,7 @@ namespace TriggerVolumeNamespace { // remove all entries from sources // and targets for the specified id - std::tr1::unordered_map::iterator const iterCountSource = m_sourcesCount.find(id); + std::unordered_map::iterator const iterCountSource = m_sourcesCount.find(id); if (iterCountSource != m_sourcesCount.end()) { int countSource = iterCountSource->second; @@ -104,7 +104,7 @@ namespace TriggerVolumeNamespace std::vector::iterator targetsIter = m_targets.begin(); std::advance(targetsIter, index); - std::tr1::unordered_map::iterator const iterCountTarget = m_targetsCount.find(*targetsIter); + std::unordered_map::iterator const iterCountTarget = m_targetsCount.find(*targetsIter); if (iterCountTarget != m_targetsCount.end()) { if (iterCountTarget->second <= 1) @@ -128,7 +128,7 @@ namespace TriggerVolumeNamespace m_sourcesCount.erase(iterCountSource); } - std::tr1::unordered_map::iterator const iterCountTarget = m_targetsCount.find(id); + std::unordered_map::iterator const iterCountTarget = m_targetsCount.find(id); if (iterCountTarget != m_targetsCount.end()) { int countTarget = iterCountTarget->second; @@ -152,7 +152,7 @@ namespace TriggerVolumeNamespace std::vector::iterator sourcesIter = m_sources.begin(); std::advance(sourcesIter, index); - std::tr1::unordered_map::iterator const iterCountSource = m_sourcesCount.find(*sourcesIter); + std::unordered_map::iterator const iterCountSource = m_sourcesCount.find(*sourcesIter); if (iterCountSource != m_sourcesCount.end()) { if (iterCountSource->second <= 1) diff --git a/engine/server/library/serverGame/src/shared/object/TriggerVolume.h b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h index 509cf761..a6b661e1 100644 --- a/engine/server/library/serverGame/src/shared/object/TriggerVolume.h +++ b/engine/server/library/serverGame/src/shared/object/TriggerVolume.h @@ -14,7 +14,7 @@ #include "sharedFoundation/NetworkId.h" #include "sharedUtility/PooledString.h" -#include +#include // ====================================================================== @@ -40,7 +40,7 @@ public: }; }; - typedef std::tr1::unordered_set ContentsSet; + typedef std::unordered_set ContentsSet; void addObject(ServerObject &object); void addEventSource(NetworkId const &source); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp index cbef50e9..5601d235 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -21,7 +21,7 @@ //@END TFD TEMPLATE REFS #include -#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); @@ -30,7 +30,7 @@ const TriggerVolumeData DefaultTriggerVolumeData; bool ServerObjectTemplate::ms_allowDefaultTemplateParams = true; -typedef std::tr1::unordered_map > XP_MAP; +typedef std::unordered_map > XP_MAP; static XP_MAP * XpMap = NULL; diff --git a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp index aa61690d..70f55095 100644 --- a/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp +++ b/engine/server/library/serverGame/src/shared/pvp/PvpUpdateObserver.cpp @@ -18,8 +18,8 @@ #include "sharedLog/Log.h" #include "sharedNetworkMessages/UpdatePvpStatusMessage.h" -#include -#include +#include +#include // ====================================================================== @@ -41,12 +41,12 @@ namespace PvpUpdateObserverNamespace }; }; - std::tr1::unordered_set s_activeUpdaters; + std::unordered_set s_activeUpdaters; - typedef std::tr1::unordered_map >, ClientObjectPointerHash> PvpUpdateObserverCache; + typedef std::unordered_map >, ClientObjectPointerHash> PvpUpdateObserverCache; PvpUpdateObserverCache s_pvpUpdateObserverCache; - typedef std::tr1::unordered_map, ClientObjectPointerHash> PvpUpdateObserverRequestsThisFrame; + typedef std::unordered_map, ClientObjectPointerHash> PvpUpdateObserverRequestsThisFrame; PvpUpdateObserverRequestsThisFrame s_pvpUpdateObserverRequestsThisFrame; // PvpUpdateObserver can be called multiple times per frame for the same object, @@ -57,10 +57,10 @@ namespace PvpUpdateObserverNamespace // so as an optimization, we'll only iterate over these 2 lists once per frame, // and then just watch on individual updates to these 2 lists afterwards, and // process the individual updates to these 2 lists when the updates occur - std::tr1::unordered_set s_objectsProcessedThisFrame; - std::tr1::unordered_set s_clientsProcessedThisFrame; + std::unordered_set s_objectsProcessedThisFrame; + std::unordered_set s_clientsProcessedThisFrame; - void sendUpdatePvpStatusMessage(Client const & client, std::tr1::unordered_set const & requestedNetworkId, std::tr1::unordered_map > & cachedNetworkId); + void sendUpdatePvpStatusMessage(Client const & client, std::unordered_set const & requestedNetworkId, std::unordered_map > & cachedNetworkId); } using namespace PvpUpdateObserverNamespace; @@ -86,7 +86,7 @@ PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDel std::set const &clients = who->getObservers(); for (std::set::const_iterator i = clients.begin(); i != clients.end(); ++i) { - std::tr1::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[*i]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[*i]; if (pvpUpdateObserverCache.count(who->getNetworkId()) == 0) { uint32 flags, factionId; @@ -104,8 +104,8 @@ PvpUpdateObserver::PvpUpdateObserver(TangibleObject const *who, Archive::AutoDel Client * const client = who->getClient(); if (client && (s_clientsProcessedThisFrame.count(client) == 0)) { - std::tr1::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; - std::tr1::unordered_set & pvpUpdateObserverRequestsThisFrame = s_pvpUpdateObserverRequestsThisFrame[client]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; + std::unordered_set & pvpUpdateObserverRequestsThisFrame = s_pvpUpdateObserverRequestsThisFrame[client]; Client::ObservingListPvpSync const &objs = client->getObservingPvpSync(); for (Client::ObservingListPvpSync::const_iterator i = objs.begin(); i != objs.end(); ++i) @@ -218,7 +218,7 @@ void PvpUpdateObserver::startObservingPvpSyncNotification(Client const *client, if ((s_objectsProcessedThisFrame.count(who.getNetworkId()) != 0) || (s_clientsProcessedThisFrame.count(client) != 0)) { - std::tr1::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; + std::unordered_map > & pvpUpdateObserverCache = s_pvpUpdateObserverCache[client]; if (pvpUpdateObserverCache.count(who.getNetworkId()) == 0) { uint32 flags, factionId; @@ -274,14 +274,14 @@ void PvpUpdateObserver::update() // ---------------------------------------------------------------------- -void PvpUpdateObserverNamespace::sendUpdatePvpStatusMessage(Client const & client, std::tr1::unordered_set const & requestedNetworkId, std::tr1::unordered_map > & cachedNetworkId) +void PvpUpdateObserverNamespace::sendUpdatePvpStatusMessage(Client const & client, std::unordered_set const & requestedNetworkId, std::unordered_map > & cachedNetworkId) { uint32 flags, factionId; ServerObject const * serverObject; TangibleObject const * tangibleObject; - std::tr1::unordered_map >::iterator iterCacheNetworkId; + std::unordered_map >::iterator iterCacheNetworkId; - for (std::tr1::unordered_set::const_iterator iterRequestedNetworkId = requestedNetworkId.begin(); iterRequestedNetworkId != requestedNetworkId.end(); ++iterRequestedNetworkId) + for (std::unordered_set::const_iterator iterRequestedNetworkId = requestedNetworkId.begin(); iterRequestedNetworkId != requestedNetworkId.end(); ++iterRequestedNetworkId) { iterCacheNetworkId = cachedNetworkId.find(*iterRequestedNetworkId); if (iterCacheNetworkId == cachedNetworkId.end()) diff --git a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp index 54f7e147..9113d33f 100644 --- a/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpaceVisibilityManager.cpp @@ -16,7 +16,7 @@ #include "sharedObject/NetworkIdManager.h" #include -#include +#include // ====================================================================== @@ -37,7 +37,7 @@ namespace SpaceVisibilityManager_namespace typedef std::set ClientSet; typedef std::set ObjectSet; typedef std::map ClientToObjectMapType; - typedef std::tr1::unordered_map TrackedObjectsType; + typedef std::unordered_map TrackedObjectsType; // Classes diff --git a/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h b/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h index 896b68d9..72d7b67d 100644 --- a/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h +++ b/engine/server/library/serverScript/src/shared/ScriptFunctionTable.h @@ -9,7 +9,7 @@ #ifndef _INCLUDED_ScriptFuncTable_H #define _INCLUDED_ScriptFuncTable_H -#include +#include namespace Scripting { @@ -495,7 +495,7 @@ struct ScriptFuncTable const char *argList; }; -typedef std::tr1::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap; +typedef std::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap; extern _ScriptFuncHashMap *ScriptFuncHashMap; extern void InitScriptFuncHashMap(void); extern void RemoveScriptFuncHashMap(void); diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp index f29095fa..00aa9c9d 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp @@ -38,7 +38,7 @@ #include "serverUtility/FreeCtsDataTable.h" #include "UnicodeUtils.h" -#include +#include using namespace JNIWrappersNamespace; @@ -434,7 +434,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse UNREF(self); NOT_NULL(env); - static std::tr1::unordered_set accountsQualifiedForHousePackup; + static std::unordered_set accountsQualifiedForHousePackup; if (accountsQualifiedForHousePackup.empty()) { DataTable * table = DataTableManager::getTable(ConfigServerGame::getHousePackupAccountListDataTableName(), true); diff --git a/engine/shared/library/sharedDebug/src/shared/LeakFinder.h b/engine/shared/library/sharedDebug/src/shared/LeakFinder.h index a4f80ce5..13fb282a 100644 --- a/engine/shared/library/sharedDebug/src/shared/LeakFinder.h +++ b/engine/shared/library/sharedDebug/src/shared/LeakFinder.h @@ -17,7 +17,7 @@ #include #include -#include +#include // ====================================================================== @@ -89,7 +89,7 @@ protected: ReferenceCountingData *referenceData; }; - typedef std::tr1::unordered_map ObjectMap; + typedef std::unordered_map ObjectMap; ObjectMap liveObjects; }; diff --git a/engine/shared/library/sharedFoundation/src/shared/NetworkId.h b/engine/shared/library/sharedFoundation/src/shared/NetworkId.h index 0a966ea1..1f42fc60 100644 --- a/engine/shared/library/sharedFoundation/src/shared/NetworkId.h +++ b/engine/shared/library/sharedFoundation/src/shared/NetworkId.h @@ -156,8 +156,6 @@ inline size_t NetworkId::getHashValue () const // STL standard hash function namespace std { -namespace tr1 -{ template <> struct hash // stl standard hash @@ -165,6 +163,6 @@ struct hash // stl standard hash size_t operator()(const NetworkId &x) const { return x.getHashValue(); } }; -}} +} #endif diff --git a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h index 6883b507..55980e13 100644 --- a/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h +++ b/engine/shared/library/sharedFoundation/src/shared/StlForwardDeclaration.h @@ -60,12 +60,8 @@ namespace std typedef basic_string, allocator > string; - namespace tr1 - { - template struct hash; - template class unordered_map; - template class unordered_set; - } + template class unordered_map; + template class unordered_set; } template > struct stddeque @@ -88,9 +84,9 @@ template , class _Alloc // typedef std::hash_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; //}; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdunordered_map +template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator< std::pair > > struct stdunordered_map { - typedef std::tr1::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; + typedef std::unordered_map<_Key, _Tp, _HashFcn, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator< std::pair > > struct stdmultimap @@ -108,9 +104,9 @@ template , class _Alloc = std::allo // typedef std::hash_set<_Key, _HashFcn, _Compare, _Alloc> fwd; //}; -template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set +template , class _Compare = std::equal_to<_Key>, class _Alloc = std::allocator<_Key> > struct stdunordered_set { - typedef std::tr1::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd; + typedef std::unordered_set<_Key, _HashFcn, _Compare, _Alloc> fwd; }; template , class _Alloc = std::allocator<_Key> > struct stdmultiset diff --git a/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp b/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp index 0114af08..705034f5 100644 --- a/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp +++ b/engine/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include // ====================================================================== @@ -25,7 +25,7 @@ namespace CombatDataTableNamespace std::string const cs_columnActionNameCrc("actionNameCrc"); int s_actionNameCrcColumn; - std::tr1::unordered_map s_commandsWithMinInvisLevelRequired; + std::unordered_map s_commandsWithMinInvisLevelRequired; } using namespace CombatDataTableNamespace; @@ -402,7 +402,7 @@ int CombatDataTable::getMinInvisLevelRequired(uint32 commandHash) if(commandHash == 0) return -1; - std::tr1::unordered_map::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash); + std::unordered_map::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash); if (it != s_commandsWithMinInvisLevelRequired.end()) return it->second; diff --git a/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp b/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp index f389a5c6..08cc4479 100644 --- a/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp @@ -19,13 +19,13 @@ #include "sharedMessageDispatch/Transceiver.h" #include "unicodeArchive/UnicodeArchive.h" #include "UnicodeUtils.h" -#include +#include // ====================================================================== namespace WaypointNamespace { - typedef std::tr1::unordered_map WaypointMapById; + typedef std::unordered_map WaypointMapById; WaypointMapById s_waypointMapById; bool s_installed; @@ -106,7 +106,7 @@ namespace Archive if (networkId.isValid()) { WaypointData *data = 0; - std::tr1::unordered_map::iterator f = s_waypointMapById.find(networkId); + std::unordered_map::iterator f = s_waypointMapById.find(networkId); if (f == s_waypointMapById.end()) data = new WaypointData(networkId); else @@ -331,7 +331,7 @@ std::string const &Waypoint::getColorNameById(uint8 id) // static Waypoint const Waypoint::getWaypointById(NetworkId const &id) // static { Waypoint result; - std::tr1::unordered_map::iterator f = s_waypointMapById.find(id); + std::unordered_map::iterator f = s_waypointMapById.find(id); if (f != s_waypointMapById.end()) result.releaseData(f->second); return result; diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp index b26cc0f8..47024992 100644 --- a/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp @@ -12,7 +12,7 @@ #include "Unicode.h" -#include +#include //====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp b/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp index 11a1398c..a13af943 100644 --- a/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp +++ b/engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp @@ -8,7 +8,7 @@ #include "sharedGame/FirstSharedGame.h" #include "sharedGame/ShipComponentType.h" -#include +#include //====================================================================== diff --git a/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h b/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h index 63ecd3eb..31b2a843 100644 --- a/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h +++ b/engine/shared/library/sharedMath/src/shared/PositionVertexIndexer.h @@ -12,7 +12,7 @@ #include "sharedMath/Vector.h" -#include +#include // ====================================================================== @@ -42,7 +42,7 @@ private: private: - typedef std::tr1::unordered_multimap VertexIndexMap; + typedef std::unordered_multimap VertexIndexMap; VectorVector * m_vertices; VertexIndexMap * m_indexMap; diff --git a/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h b/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h index 4c69c929..47585ed6 100644 --- a/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h +++ b/engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h @@ -16,7 +16,7 @@ #include "sharedMessageDispatch/Message.h" #include "sharedMessageDispatch/Receiver.h" #include -#include +#include // ====================================================================== diff --git a/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp b/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp index cc7ac00c..d6b5666a 100644 --- a/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp +++ b/engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp @@ -7,7 +7,7 @@ #include "sharedMessageDispatch/Receiver.h" #include -#include +#include namespace MessageDispatch { @@ -15,8 +15,8 @@ MessageManager MessageManager::ms_instance; struct MessageManager::Data { - std::tr1::unordered_map > receivers; - std::tr1::unordered_map > staticCallbacks; + std::unordered_map > receivers; + std::unordered_map > staticCallbacks; }; //--------------------------------------------------------------------- @@ -72,7 +72,7 @@ void MessageManager::addReceiver(Receiver & target, const MessageBase & source) void MessageManager::addReceiver(Receiver & target, const unsigned long int messageType) { - std::tr1::unordered_map >::iterator i = data->receivers.find(messageType); + std::unordered_map >::iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { target.setHasTargets(true); @@ -92,7 +92,7 @@ void MessageManager::addReceiver(Receiver & target, const unsigned long int mess void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const MessageBase &), const unsigned long int messageType) { - std::tr1::unordered_map >::iterator f = data->staticCallbacks.find(messageType); + std::unordered_map >::iterator f = data->staticCallbacks.find(messageType); if(f != data->staticCallbacks.end()) { std::set & targets = f->second; @@ -121,7 +121,7 @@ void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const M void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & message) const { const unsigned long int messageType = message.getType(); - std::tr1::unordered_map >::const_iterator i = data->receivers.find(messageType); + std::unordered_map >::const_iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { const std::set targets = (*i).second; @@ -136,7 +136,7 @@ void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & me } } - std::tr1::unordered_map >::iterator f = data->staticCallbacks.find(messageType); + std::unordered_map >::iterator f = data->staticCallbacks.find(messageType); if(f != data->staticCallbacks.end()) { const std::set targets = f->second; @@ -160,7 +160,7 @@ void MessageManager::receiverDestroyed(const Receiver & target) return; } // find receiver - std::tr1::unordered_map >::iterator i; + std::unordered_map >::iterator i; for(i = data->receivers.begin(); i != data->receivers.end(); ++i) { std::set & targets = (*i).second; @@ -200,7 +200,7 @@ void MessageManager::removeReceiver(const Receiver & target, const char * const void MessageManager::removeReceiver(const Receiver & target, const unsigned long int messageType) { - std::tr1::unordered_map >::iterator i = data->receivers.find(messageType); + std::unordered_map >::iterator i = data->receivers.find(messageType); if(i != data->receivers.end()) { std::set & targets = (*i).second; diff --git a/engine/shared/library/sharedNetwork/src/win32/Address.cpp b/engine/shared/library/sharedNetwork/src/win32/Address.cpp index a6338857..0d4b0b2a 100644 --- a/engine/shared/library/sharedNetwork/src/win32/Address.cpp +++ b/engine/shared/library/sharedNetwork/src/win32/Address.cpp @@ -374,7 +374,7 @@ size_t Address::hashFunction() const Example: \code - typedef std::tr1::unordered_map AddressMap; + typedef std::unordered_map AddressMap; \endcode @return true if the left hand side and right hand side are equal diff --git a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp index 7f594ae4..bd1a5db3 100644 --- a/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp +++ b/engine/shared/library/sharedNetworkMessages/src/shared/common/GameNetworkMessage.cpp @@ -13,7 +13,7 @@ #include "sharedFoundation/CrcString.h" #include "sharedNetworkMessages/NetworkMessageFactory.h" #include -#include +#include // ====================================================================== @@ -22,7 +22,7 @@ std::string const GameNetworkMessage::NetworkVersionId = "20100225-17:43"; namespace GameNetworkMessageNamespace { - std::tr1::unordered_map gs_messageCount; + std::unordered_map gs_messageCount; // ---------------------------------------------------------------------- @@ -34,7 +34,7 @@ namespace GameNetworkMessageNamespace } }; - std::tr1::unordered_map s_messageTypes; + std::unordered_map s_messageTypes; } using namespace GameNetworkMessageNamespace; @@ -105,7 +105,7 @@ std::vector > const GameNetworkMessage::getMessageCo { std::vector > result; - for (std::tr1::unordered_map ::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i) + for (std::unordered_map ::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i) result.push_back(std::make_pair(s_messageTypes[(*i).first], (*i).second)); std::sort(result.begin(), result.end(), SortPair()); diff --git a/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp b/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp index 9e41ab00..b2278580 100644 --- a/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/NetworkIdManager.cpp @@ -10,7 +10,7 @@ #include "sharedFoundation/NetworkId.h" #include "sharedObject/Object.h" -#include +#include #include //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp index 87ee2458..c92f73c4 100644 --- a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp +++ b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.cpp @@ -15,7 +15,7 @@ #include "sharedDebug/InstallTimer.h" #include -#include +#include #include SkillManager *SkillManager::ms_instance = NULL; diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp index 933709e1..262dfcf7 100644 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.cpp @@ -13,7 +13,7 @@ #include "sharedUtility/DataTableCell.h" #include -#include +#include //---------------------------------------------------------------------------- diff --git a/engine/shared/library/sharedUtility/src/shared/DataTable.h b/engine/shared/library/sharedUtility/src/shared/DataTable.h index 849d9fc9..ef9c3fe3 100644 --- a/engine/shared/library/sharedUtility/src/shared/DataTable.h +++ b/engine/shared/library/sharedUtility/src/shared/DataTable.h @@ -15,7 +15,7 @@ #include #include -#include +#include class Iff; @@ -84,7 +84,7 @@ private: void buildColumnIndexMap(); typedef std::vector DataTableColumnTypeVector; - typedef std::tr1::unordered_map ColumnIndexMap; + typedef std::unordered_map ColumnIndexMap; int m_numRows; int m_numCols; diff --git a/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp b/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp index 75b4eff9..68f1057c 100644 --- a/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp +++ b/engine/shared/library/sharedUtility/src/shared/WorldSnapshotReaderWriter.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include //=================================================================== diff --git a/external/3rd/library/platform/utils/Base/linux/Types.h b/external/3rd/library/platform/utils/Base/linux/Types.h index bc869bac..6ee50450 100644 --- a/external/3rd/library/platform/utils/Base/linux/Types.h +++ b/external/3rd/library/platform/utils/Base/linux/Types.h @@ -21,9 +21,9 @@ namespace NAMESPACE namespace Base { -#define INT32_MAX 0x7FFFFFFF -#define INT32_MIN 0x80000000 -#define UINT32_MAX 0xFFFFFFFF +//#define INT32_MAX 0x7FFFFFFF +//#define INT32_MIN 0x80000000 +//#define UINT32_MAX 0xFFFFFFFF typedef signed char int8; typedef unsigned char uint8; diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h index bc869bac..6ee50450 100644 --- a/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h +++ b/external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h @@ -21,9 +21,9 @@ namespace NAMESPACE namespace Base { -#define INT32_MAX 0x7FFFFFFF -#define INT32_MIN 0x80000000 -#define UINT32_MAX 0xFFFFFFFF +//#define INT32_MAX 0x7FFFFFFF +//#define INT32_MIN 0x80000000 +//#define UINT32_MAX 0xFFFFFFFF typedef signed char int8; typedef unsigned char uint8; diff --git a/external/ours/library/localization/src/shared/LocalizationManager.h b/external/ours/library/localization/src/shared/LocalizationManager.h index ce9339ba..e31844c4 100644 --- a/external/ours/library/localization/src/shared/LocalizationManager.h +++ b/external/ours/library/localization/src/shared/LocalizationManager.h @@ -18,7 +18,7 @@ #pragma warning (disable:4786) #endif -#include +#include #include "Unicode.h" #include "UnicodeUtils.h" @@ -57,8 +57,8 @@ public: ~LocalizationManager (); typedef std::pair TimedStringTable; - typedef std::tr1::unordered_map StringTableMap_t; - typedef std::tr1::unordered_map LocalizationManagerHashMap; + typedef std::unordered_map StringTableMap_t; + typedef std::unordered_map LocalizationManagerHashMap; static void install (AbstractFileFactory * fileFactory, Unicode::UnicodeNarrowStringVector & localeNames, bool debugStrings, DebugBadStringsFunc debugBadStringsFunc = 0, bool displayBadStringIds = true); static void remove (); diff --git a/external/ours/library/unicode/src/shared/Unicode.h b/external/ours/library/unicode/src/shared/Unicode.h index f2ea1d18..0f29b589 100644 --- a/external/ours/library/unicode/src/shared/Unicode.h +++ b/external/ours/library/unicode/src/shared/Unicode.h @@ -18,7 +18,7 @@ #endif #include -#include +#include //----------------------------------------------------------------- @@ -47,7 +47,6 @@ namespace Unicode } namespace std { -namespace tr1 { template<> struct hash @@ -64,7 +63,7 @@ namespace tr1 { } }; -}} +} //----------------------------------------------------------------- diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h index 843a5c57..bf2fc1d6 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/IndexedTableBuffer.h @@ -11,7 +11,7 @@ // ====================================================================== -#include +#include #include "serverDatabase/TableBuffer.h" // ====================================================================== @@ -37,7 +37,7 @@ class IndexedNetworkTableBuffer : public TableBuffer IndexedNetworkTableBuffer(TableBufferMode mode, DB::ModeQuery *query); private: - typedef std::tr1::unordered_map IndexType; + typedef std::unordered_map IndexType; /** * Index to locate rows. * diff --git a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h index 5843f1a4..603a9d70 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h +++ b/game/server/application/SwgDatabaseServer/src/shared/buffers/MarketAuctionsBuffer.h @@ -13,7 +13,7 @@ #include "SwgDatabaseServer/CommoditiesQuery.h" #include "SwgDatabaseServer/CommoditiesSchema.h" #include "serverDatabase/AbstractTableBuffer.h" -#include +#include #include // ====================================================================== @@ -47,10 +47,10 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRow *row); private: - typedef std::tr1::unordered_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; - typedef std::tr1::unordered_map > > AttributesType; + typedef std::unordered_map > > AttributesType; AttributesType m_attributes; private: @@ -79,7 +79,7 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRowDelete *row); private: - typedef std::tr1::unordered_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; private: @@ -108,7 +108,7 @@ private: void addRowToIndex (const NetworkId &itemId, DBSchema::MarketAuctionsRowUpdate *row); private: - typedef std::tr1::unordered_map IndexType; + typedef std::unordered_map IndexType; IndexType m_rows; private: diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp index f4e4c349..7fe4876a 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp @@ -10,7 +10,7 @@ #include "SwgDatabaseServer/TaskSaveObjvarNames.h" #include "sharedFoundation/ExitChain.h" -#include +#include #include #include