swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-27 14:12:54 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stlport-removal' of bitbucket.org:anon/swg-src into stlport-removal

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:30:49 -07:00
parent 09994b21d9 210bdb91d8
commit 594635e01a
71 changed files with 236 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/3rd/library/platform/utils/Base/linux/Types.h
Vendored
+3 -3
View File
@@ -21,9 +21,9 @@ namespace NAMESPACE
namespace Base
{
#define INT32_MAX 0x7FFFFFFF
#define INT32_MIN 0x80000000
#define UINT32_MAX 0xFFFFFFFF
//#define INT32_MAX 0x7FFFFFFF
//#define INT32_MIN 0x80000000
//#define UINT32_MAX 0xFFFFFFFF
typedef signed char int8;
typedef unsigned char uint8;
external/3rd/library/soePlatform/ChatAPI/utils/Base/linux/Types.h
Vendored
+3 -3
View File
@@ -21,9 +21,9 @@ namespace NAMESPACE
namespace Base
{
#define INT32_MAX 0x7FFFFFFF
#define INT32_MIN 0x80000000
#define UINT32_MAX 0xFFFFFFFF
//#define INT32_MAX 0x7FFFFFFF
//#define INT32_MIN 0x80000000
//#define UINT32_MAX 0xFFFFFFFF
typedef signed char int8;
typedef unsigned char uint8;
external/ours/library/localization/src/shared/LocalizationManager.h
Vendored
+3 -3
View File
@@ -18,7 +18,7 @@
#pragma warning (disable:4786)
#endif
#include <tr1/unordered_map>
#include <unordered_map>
#include "Unicode.h"
#include "UnicodeUtils.h"
@@ -57,8 +57,8 @@ public:
~LocalizationManager ();
typedef std::pair<time_t, LocalizedStringTable *> TimedStringTable;
typedef std::tr1::unordered_map<Unicode::NarrowString, TimedStringTable> StringTableMap_t;
typedef std::tr1::unordered_map<Unicode::NarrowString, LocalizationManager *> LocalizationManagerHashMap;
typedef std::unordered_map<Unicode::NarrowString, TimedStringTable> StringTableMap_t;
typedef std::unordered_map<Unicode::NarrowString, LocalizationManager *> LocalizationManagerHashMap;
static void install (AbstractFileFactory * fileFactory, Unicode::UnicodeNarrowStringVector & localeNames, bool debugStrings, DebugBadStringsFunc debugBadStringsFunc = 0, bool displayBadStringIds = true);
static void remove ();
external/ours/library/unicode/src/shared/Unicode.h
Vendored
+2 -3
View File
@@ -18,7 +18,7 @@
#endif
#include <string>
#include <tr1/unordered_map>
#include <unordered_map>
//-----------------------------------------------------------------
@@ -47,7 +47,6 @@ namespace Unicode
}
namespace std {
namespace tr1 {
template<>
struct hash<Unicode::String>
@@ -64,7 +63,7 @@ namespace tr1 {
}
};
}}
}
//-----------------------------------------------------------------