swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-14 00:01:30 -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/serverScript/src/shared/ScriptFunctionTable.h
+2 -2
View File
@@ -9,7 +9,7 @@
#ifndef _INCLUDED_ScriptFuncTable_H
#define _INCLUDED_ScriptFuncTable_H
#include <tr1/unordered_map>
#include <unordered_map>
namespace Scripting
{
@@ -495,7 +495,7 @@ struct ScriptFuncTable
const char *argList;
};
typedef std::tr1::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap;
typedef std::unordered_map< int, const ScriptFuncTable * > _ScriptFuncHashMap;
extern _ScriptFuncHashMap *ScriptFuncHashMap;
extern void InitScriptFuncHashMap(void);
extern void RemoveScriptFuncHashMap(void);
engine/server/library/serverScript/src/shared/ScriptMethodsPlayerAccount.cpp
+2 -2
View File
@@ -38,7 +38,7 @@
#include "serverUtility/FreeCtsDataTable.h"
#include "UnicodeUtils.h"
#include <tr1/unordered_set>
#include <unordered_set>
using namespace JNIWrappersNamespace;
@@ -434,7 +434,7 @@ jboolean JNICALL ScriptMethodsPlayerAccountNamespace::isAccountQualifiedForHouse
UNREF(self);
NOT_NULL(env);
static std::tr1::unordered_set<StationId> accountsQualifiedForHousePackup;
static std::unordered_set<StationId> accountsQualifiedForHousePackup;
if (accountsQualifiedForHousePackup.empty())
{
DataTable * table = DataTableManager::getTable(ConfigServerGame::getHousePackupAccountListDataTableName(), true);