mirror of
https://github.com/SWG-Source/src.git
synced 2026-10-08 00:12:55 -04:00
Removed STLport requirement
This commit is contained in:
+2
@@ -11,6 +11,8 @@
|
||||
#include "sharedMathArchive/VectorArchive.h"
|
||||
#include "sharedNetworkMessages/ClientMfdStatusUpdateMessage.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
//-----------------------------------------------------------------------
|
||||
|
||||
const char * const ClientMfdStatusUpdateMessage::MESSAGE_TYPE = "ClientMfdStatusUpdateMessage";
|
||||
|
||||
+4
-4
@@ -24,8 +24,8 @@ public:
|
||||
|
||||
struct ExperimentInfo
|
||||
{
|
||||
const int attributeIndex; // which attribute is being experiemnted
|
||||
const int experimentPoints; // how many experiment points are allocated
|
||||
int attributeIndex; // which attribute is being experiemnted
|
||||
int experimentPoints; // how many experiment points are allocated
|
||||
|
||||
ExperimentInfo(int attribute, int points) :
|
||||
attributeIndex(attribute),
|
||||
@@ -33,8 +33,8 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
private:
|
||||
ExperimentInfo & operator = (const ExperimentInfo &);
|
||||
//private:
|
||||
// ExperimentInfo & operator = (const ExperimentInfo &);
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
+2
-2
@@ -43,8 +43,8 @@ public:
|
||||
|
||||
int numParameters;
|
||||
std::vector<std::string> parameters;
|
||||
private:
|
||||
TaskInfo & operator = (const TaskInfo &);
|
||||
//private:
|
||||
// TaskInfo & operator = (const TaskInfo &);
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
+4
-4
@@ -13,7 +13,7 @@
|
||||
#include "sharedFoundation/CrcString.h"
|
||||
#include "sharedNetworkMessages/NetworkMessageFactory.h"
|
||||
#include <algorithm>
|
||||
#include <hash_map>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
// ======================================================================
|
||||
|
||||
@@ -22,7 +22,7 @@ std::string const GameNetworkMessage::NetworkVersionId = "20100225-17:43";
|
||||
|
||||
namespace GameNetworkMessageNamespace
|
||||
{
|
||||
std::hash_map<unsigned long, int> gs_messageCount;
|
||||
std::tr1::unordered_map<unsigned long, int> gs_messageCount;
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace GameNetworkMessageNamespace
|
||||
}
|
||||
};
|
||||
|
||||
std::hash_map<unsigned long, std::string> s_messageTypes;
|
||||
std::tr1::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::hash_map<unsigned long, int>::const_iterator i = gs_messageCount.begin(); i != gs_messageCount.end(); ++i)
|
||||
for (std::tr1::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