mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10376] Fixed build at VS90 with TR1

Browse source 
As problems show VS90 with TR1 different from VS100 by expected namespaces.
This commit is contained in:
VladimirMangos 2010-08-19 02:24:31 +04:00
parent ce46397940
commit c5ffa7710b
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/framework/Utilities/UnorderedMapSet.h
View file

@ -46,11 +46,16 @@
# define HASH_NAMESPACE_END } # define HASH_NAMESPACE_END }
using std::hash_map; using std::hash_map;
using std::hash_set; using std::hash_set;
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600 // VS100
# define UNORDERED_MAP std::tr1::unordered_map # define UNORDERED_MAP std::tr1::unordered_map
# define UNORDERED_SET std::tr1::unordered_set # define UNORDERED_SET std::tr1::unordered_set
# define HASH_NAMESPACE_START namespace std { # define HASH_NAMESPACE_START namespace std {
# define HASH_NAMESPACE_END } # define HASH_NAMESPACE_END }
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1
# define UNORDERED_MAP std::tr1::unordered_map
# define UNORDERED_SET std::tr1::unordered_set
# define HASH_NAMESPACE_START namespace std { namespace tr1 {
# define HASH_NAMESPACE_END } }
#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 #elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300
# define UNORDERED_MAP stdext::hash_map # define UNORDERED_MAP stdext::hash_map
# define UNORDERED_SET stdext::hash_set # define UNORDERED_SET stdext::hash_set

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10375" #define REVISION_NR "10376"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__