mirror of
https://github.com/SWG-Source/src.git
synced 2026-09-29 16:13:07 -04:00
Removed STLport requirement
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
#include "sharedUtility/DataTableCell.h"
|
||||
|
||||
#include <map>
|
||||
#include <hash_map>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
class Iff;
|
||||
|
||||
@@ -83,7 +84,7 @@ private:
|
||||
void buildColumnIndexMap();
|
||||
|
||||
typedef std::vector<const DataTableColumnType *> DataTableColumnTypeVector;
|
||||
typedef stdhash_map<std::string /*column name*/, int /*column index*/>::fwd ColumnIndexMap;
|
||||
typedef std::tr1::unordered_map<std::string /*column name*/, int /*column index*/> ColumnIndexMap;
|
||||
|
||||
int m_numRows;
|
||||
int m_numCols;
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <hash_map>
|
||||
#include <tr1/unordered_map>
|
||||
|
||||
//===================================================================
|
||||
|
||||
@@ -710,7 +710,7 @@ WorldSnapshotReaderWriter::Node const *WorldSnapshotReaderWriter::addObject (
|
||||
//-- find objectTemplateNameIndex
|
||||
uint objectTemplateNameIndex = 0;
|
||||
|
||||
std::hash_map<uint32, uint>::const_iterator i = m_objectTemplateCrcMap->find(objectTemplateName.getCrc());
|
||||
ObjectTemplateCrcMap::const_iterator i = m_objectTemplateCrcMap->find(objectTemplateName.getCrc());
|
||||
if (i != m_objectTemplateCrcMap->end())
|
||||
objectTemplateNameIndex = (*i).second;
|
||||
else
|
||||
|
||||
@@ -175,7 +175,7 @@ private:
|
||||
typedef stdvector<char*>::fwd ObjectTemplateNameList;
|
||||
ObjectTemplateNameList* const m_objectTemplateNameList;
|
||||
|
||||
typedef stdhash_map<uint32, uint>::fwd ObjectTemplateCrcMap;
|
||||
typedef stdunordered_map<uint32, uint>::fwd ObjectTemplateCrcMap;
|
||||
ObjectTemplateCrcMap* const m_objectTemplateCrcMap; // map from crc to index in name list
|
||||
|
||||
typedef stdmap<int64, Node*>::fwd NetworkIdNodeMap;
|
||||
|
||||
Reference in New Issue
Block a user