swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

Removed references to tr1 now that c++11 works

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:28:13 -07:00
parent e6431a9fd4
commit 210bdb91d8
56 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp
+5 -5
View File
@@ -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<uint32, GameServerConnection *>::const_iterator j = gameServerConnections.find(processId);
std::unordered_map<uint32, GameServerConnection *>::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<uint32, GameServerConnection *>::const_iterator j = gameServerConnections.find(processId);
std::unordered_map<uint32, GameServerConnection *>::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<uint32> &processIds) const
{
for (std::tr1::unordered_map<uint32, GameServerConnection *>::const_iterator i = gameServerConnections.begin(); i != gameServerConnections.end(); ++i)
for (std::unordered_map<uint32, GameServerConnection *>::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<uint32, GameServerConnection *>::const_iterator i=gameServerConnections.begin(); i!=gameServerConnections.end(); ++i)
for (std::unordered_map<uint32, GameServerConnection *>::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<uint32, GameServerConnection *>::const_iterator i=gameServerConnections.find(serverId);
std::unordered_map<uint32, GameServerConnection *>::const_iterator i=gameServerConnections.find(serverId);
if (i!=gameServerConnections.end())
i->second->send(message,true);
else
engine/server/library/serverDatabase/src/shared/DatabaseProcess.h
+2 -2
View File
@@ -10,7 +10,7 @@
// ======================================================================
#include <tr1/unordered_map>
#include <unordered_map>
#include <set>
#include <string>
#include "sharedFoundation/NetworkIdArchive.h"
@@ -88,7 +88,7 @@ class DatabaseProcess : public MessageDispatch::Receiver
CommoditiesServerConnection * commoditiesConnection;
DatabaseMetricsData * m_metricsData;
std::tr1::unordered_map<uint32, GameServerConnection *> gameServerConnections;
std::unordered_map<uint32, GameServerConnection *> gameServerConnections;
std::set<std::pair<std::string, unsigned short> > pendingGameServerConnections;
int m_queryExecCount;
engine/server/library/serverDatabase/src/shared/Persister.h
+2 -2
View File
@@ -12,7 +12,7 @@
#include <map>
#include <string>
#include <tr1/unordered_map>
#include <unordered_map>
#include <vector>
#include <set> //TODO: remove when we clean up newCharacterLock hack
@@ -105,7 +105,7 @@ class Persister : public MessageDispatch::Receiver
};
typedef std::map<uint32,Snapshot*> ServerSnapshotMap;
typedef std::tr1::unordered_map<NetworkId,Snapshot*> ObjectSnapshotMap;
typedef std::unordered_map<NetworkId,Snapshot*> ObjectSnapshotMap;
typedef std::map<NetworkId,PendingCharacter> PendingCharactersType;
typedef std::vector<Snapshot*> SnapshotListType;
typedef std::set<uint32> NewCharacterLockType;