mirror of
https://github.com/SWG-Source/src.git
synced 2026-08-01 01:16:03 -04:00
Removed references to tr1 now that c++11 works
This commit is contained in:
+4
-4
@@ -13,7 +13,7 @@
|
||||
#include "sharedFoundation/CrcString.h"
|
||||
#include "sharedNetworkMessages/NetworkMessageFactory.h"
|
||||
#include <algorithm>
|
||||
#include <tr1/unordered_map>
|
||||
#include <unordered_map>
|
||||
|
||||
// ======================================================================
|
||||
|
||||
@@ -22,7 +22,7 @@ std::string const GameNetworkMessage::NetworkVersionId = "20100225-17:43";
|
||||
|
||||
namespace GameNetworkMessageNamespace
|
||||
{
|
||||
std::tr1::unordered_map<unsigned long, int> gs_messageCount;
|
||||
std::unordered_map<unsigned long, int> gs_messageCount;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace GameNetworkMessageNamespace
|
||||
}
|
||||
};
|
||||
|
||||
std::tr1::unordered_map<unsigned long, std::string> s_messageTypes;
|
||||
std::unordered_map<unsigned long, std::string> s_messageTypes;
|
||||
}
|
||||
|
||||
using namespace GameNetworkMessageNamespace;
|
||||
@@ -105,7 +105,7 @@ std::vector<std::pair<std::string, int> > const GameNetworkMessage::getMessageCo
|
||||
{
|
||||
std::vector<std::pair<std::string, int> > result;
|
||||
|
||||
for (std::tr1::unordered_map <unsigned long, int>::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i)
|
||||
for (std::unordered_map <unsigned long, int>::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());
|
||||
|
||||
Reference in New Issue
Block a user