swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-11 21:44:58 -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/shared/library/sharedGame/src/shared/combat/CombatDataTable.cpp
+3 -3
View File
@@ -15,7 +15,7 @@
#include <string>
#include <algorithm>
#include <cctype>
#include <tr1/unordered_map>
#include <unordered_map>
// ======================================================================
@@ -25,7 +25,7 @@ namespace CombatDataTableNamespace
std::string const cs_columnActionNameCrc("actionNameCrc");
int s_actionNameCrcColumn;
std::tr1::unordered_map<uint32, int> s_commandsWithMinInvisLevelRequired;
std::unordered_map<uint32, int> s_commandsWithMinInvisLevelRequired;
}
using namespace CombatDataTableNamespace;
@@ -402,7 +402,7 @@ int CombatDataTable::getMinInvisLevelRequired(uint32 commandHash)
if(commandHash == 0)
return -1;
std::tr1::unordered_map<uint32, int>::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash);
std::unordered_map<uint32, int>::const_iterator it = s_commandsWithMinInvisLevelRequired.find(commandHash);
if (it != s_commandsWithMinInvisLevelRequired.end())
return it->second;
engine/shared/library/sharedGame/src/shared/object/Waypoint.cpp
+4 -4
View File
@@ -19,13 +19,13 @@
#include "sharedMessageDispatch/Transceiver.h"
#include "unicodeArchive/UnicodeArchive.h"
#include "UnicodeUtils.h"
#include <tr1/unordered_map>
#include <unordered_map>
// ======================================================================
namespace WaypointNamespace
{
typedef std::tr1::unordered_map<NetworkId, WaypointData *> WaypointMapById;
typedef std::unordered_map<NetworkId, WaypointData *> WaypointMapById;
WaypointMapById s_waypointMapById;
bool s_installed;
@@ -106,7 +106,7 @@ namespace Archive
if (networkId.isValid())
{
WaypointData *data = 0;
std::tr1::unordered_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(networkId);
std::unordered_map<NetworkId, WaypointData *>::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<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(id);
std::unordered_map<NetworkId, WaypointData *>::iterator f = s_waypointMapById.find(id);
if (f != s_waypointMapById.end())
result.releaseData(f->second);
return result;
engine/shared/library/sharedGame/src/shared/space/ShipChassisSlotType.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include "Unicode.h"
#include <tr1/unordered_map>
#include <unordered_map>
//======================================================================
engine/shared/library/sharedGame/src/shared/space/ShipComponentType.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "sharedGame/FirstSharedGame.h"
#include "sharedGame/ShipComponentType.h"
#include <tr1/unordered_map>
#include <unordered_map>
//======================================================================