mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-29 23:15:56 -04:00
Removed references to tr1 now that c++11 works
This commit is contained in:
Anonymous
@@ -89,7 +89,7 @@ namespace ChatInterfaceNamespace
|
||||
static int s_maxHeadersToSendToClientPerInterval;
|
||||
|
||||
// to prevent sending duplicate room chat message
|
||||
std::tr1::unordered_map<unsigned, std::pair<unsigned, unsigned> > s_mostRecentRoomChatMessage;
|
||||
std::unordered_map<unsigned, std::pair<unsigned, unsigned> > 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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(lowerRoomName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::const_iterator f = roomList.find(lowerRoomName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, NetworkId>::iterator p = pendingAvatars.begin();
|
||||
std::unordered_map<std::string, NetworkId>::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<std::string, NetworkId>::iterator i;
|
||||
std::unordered_map<std::string, NetworkId>::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<std::string, NetworkId>::iterator f = pendingAvatars.find(id.name);
|
||||
std::unordered_map<std::string, NetworkId>::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<std::string, ChatServerRoomOwner> & ChatInterface::getRoomList() const
|
||||
const std::unordered_map<std::string, ChatServerRoomOwner> & ChatInterface::getRoomList() const
|
||||
{
|
||||
return roomList;
|
||||
}
|
||||
@@ -618,7 +618,7 @@ const std::tr1::unordered_map<std::string, ChatServerRoomOwner> & ChatInterface:
|
||||
|
||||
void ChatInterface::updateRooms()
|
||||
{
|
||||
std::tr1::unordered_map<std::string, ChatServerRoomOwner>::const_iterator i;
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::const_iterator i;
|
||||
for(i = roomList.begin(); i != roomList.end(); ++i)
|
||||
{
|
||||
ChatServerRoomOwner & roomOwner = const_cast<ChatServerRoomOwner &>((*i).second);
|
||||
@@ -656,7 +656,7 @@ void ChatInterface::requestRoomList(const NetworkId & id, ConnectionServerConnec
|
||||
|
||||
++roomQueriesThisFrame;
|
||||
|
||||
std::tr1::unordered_map<std::string, ChatServerRoomOwner>::const_iterator i;
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::const_iterator i;
|
||||
std::vector<ChatRoomData> 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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, NetworkId>::iterator f = pendingAvatars.find(failedAvatarId.name);
|
||||
std::unordered_map<std::string, NetworkId>::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<std::string, NetworkId>::iterator f = pendingAvatars.find(id.name);
|
||||
std::unordered_map<std::string, NetworkId>::iterator f = pendingAvatars.find(id.name);
|
||||
if(f != pendingAvatars.end())
|
||||
{
|
||||
GenericValueTypeMessage<NetworkId> 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, std::vector<Archive::ByteStream>, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second);
|
||||
std::unordered_map<NetworkId, std::vector<Archive::ByteStream>, NetworkId::Hash >::iterator df = deferredChatMessages.find((*f).second);
|
||||
if(df != deferredChatMessages.end())
|
||||
{
|
||||
std::vector<Archive::ByteStream> & 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<std::string, ChatServerRoomOwner>::const_iterator f = roomList.find(lowerRoomName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::const_iterator f = roomList.find(lowerName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.begin();
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(lowerName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(lowerName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator const f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::iterator f = roomList.find(toLower(roomName));
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<unsigned, std::pair<unsigned, unsigned> >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId);
|
||||
std::unordered_map<unsigned, std::pair<unsigned, unsigned> >::iterator const iterFind = s_mostRecentRoomChatMessage.find(destAvatarId);
|
||||
if (iterFind != s_mostRecentRoomChatMessage.end())
|
||||
{
|
||||
if ((iterFind->second.first == destRoomId) && (iterFind->second.second == messageID))
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "ChatServerAvatarOwner.h"
|
||||
#include "ChatServerRoomOwner.h"
|
||||
#include <deque>
|
||||
#include <tr1/unordered_map>
|
||||
#include <unordered_map>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <string>
|
||||
@@ -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<std::string, ChatServerRoomOwner> & getRoomList () const;
|
||||
const std::unordered_map<std::string, ChatServerRoomOwner> & getRoomList () const;
|
||||
|
||||
const ChatServerRoomOwner *getRoomOwner(const std::string &roomName);
|
||||
ChatServerRoomOwner *getRoomOwner(unsigned roomId);
|
||||
@@ -157,11 +157,11 @@ public:
|
||||
|
||||
private:
|
||||
std::map<ChatAvatarId, ChatServerAvatarOwner *> avatarMap;
|
||||
std::tr1::unordered_map<std::string, NetworkId> pendingAvatars;
|
||||
std::unordered_map<std::string, NetworkId> pendingAvatars;
|
||||
std::set<NetworkId> pendingRoomQueries;
|
||||
int roomQueriesThisFrame;
|
||||
std::tr1::unordered_map<std::string, ChatServerRoomOwner> roomList;
|
||||
std::tr1::unordered_map<NetworkId, std::vector<Archive::ByteStream>, NetworkId::Hash > deferredChatMessages;
|
||||
std::unordered_map<std::string, ChatServerRoomOwner> roomList;
|
||||
std::unordered_map<NetworkId, std::vector<Archive::ByteStream>, NetworkId::Hash > deferredChatMessages;
|
||||
std::map<ChatAvatarId, std::pair<unsigned long, std::deque<const ChatPersistentMessageToClient *> > > queuedHeaders;
|
||||
std::map<unsigned, std::pair<std::pair<ChatUnicodeString, ChatUnicodeString>, int> > trackingRequestGetAnyAvatarForDestroy;
|
||||
};
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace ChatServerNamespace
|
||||
ChatServerMetricsData * s_chatServerMetricsData = 0;
|
||||
|
||||
typedef std::list<std::pair<int, time_t> > MessageList;
|
||||
typedef std::tr1::unordered_map<Unicode::String, MessageList> PlayerMessageList;
|
||||
typedef std::unordered_map<Unicode::String, MessageList> 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<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::const_iterator f = instance().clientMap.find(id);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<unsigned, NetworkId>::iterator f = server.pendingRequests.find(trackId);
|
||||
std::unordered_map<unsigned, NetworkId>::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<unsigned, NetworkId>::iterator f = server.pendingRequests.find(trackId);
|
||||
std::unordered_map<unsigned, NetworkId>::iterator f = server.pendingRequests.find(trackId);
|
||||
if(f != server.pendingRequests.end())
|
||||
{
|
||||
id = (*f).second;
|
||||
std::tr1::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::const_iterator c = server.clientMap.find((*f).second);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<unsigned int, GameServerConnection *>::iterator f = instance().gameServerConnectionMap.find(sequence);
|
||||
std::unordered_map<unsigned int, GameServerConnection *>::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<unsigned int> removeKeyList;
|
||||
std::tr1::unordered_map<unsigned int, GameServerConnection *>::const_iterator i;
|
||||
std::unordered_map<unsigned int, GameServerConnection *>::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<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::iterator f = instance().clientMap.find(characterId);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::iterator cf = instance().clientMap.find(networkId);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<std::string, ChatServerRoomOwner>::const_iterator i;
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::iterator cf = instance().clientMap.find(id);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<std::string, ChatServerRoomOwner>::const_iterator f = instance().chatInterface->getRoomList().find(lowerName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<std::string, ChatServerRoomOwner>::const_iterator f = instance().chatInterface->getRoomList().find(lowerName);
|
||||
std::unordered_map<std::string, ChatServerRoomOwner>::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<NetworkId, ConnectionServerConnection *, NetworkId::Hash> tmpList = instance().clientMap;
|
||||
std::tr1::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::const_iterator i;
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash> tmpList = instance().clientMap;
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::const_iterator i;
|
||||
for(i = tmpList.begin(); i != tmpList.end(); ++i)
|
||||
{
|
||||
if((*i).second == target)
|
||||
disconnectPlayer((*i).first);
|
||||
std::tr1::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::iterator f = instance().clientMap.find((*i).first);
|
||||
std::unordered_map<NetworkId, ConnectionServerConnection *, NetworkId::Hash>::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<unsigned int, GameServerConnection *>::iterator f = m_gameServerConnectionRegistry.find(sequence);
|
||||
std::unordered_map<unsigned int, GameServerConnection *>::iterator f = m_gameServerConnectionRegistry.find(sequence);
|
||||
if(f != m_gameServerConnectionRegistry.end())
|
||||
{
|
||||
result = (*f).second;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Archive
|
||||
#include "sharedFoundation/NetworkId.h"
|
||||
#include "sharedNetwork/Connection.h"
|
||||
#include "ChatAPI/ChatAPI.h"
|
||||
#include <tr1/unordered_map>
|
||||
#include <unordered_map>
|
||||
#include <string>
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user