forked from 0ad/0ad
Extended the hash_map kludge to detect gcc
This was SVN commit r359.
This commit is contained in:
parent
4ba7fc3b7c
commit
c09ab35453
@ -15,20 +15,25 @@
|
|||||||
#ifndef ENTITY_PROPERTIES_INCLUDED
|
#ifndef ENTITY_PROPERTIES_INCLUDED
|
||||||
#define ENTITY_PROPERTIES_INCLUDED
|
#define ENTITY_PROPERTIES_INCLUDED
|
||||||
|
|
||||||
#if( defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) )
|
|
||||||
|
|
||||||
#define STL_HASH_MAP stdext::hash_map
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
#define STL_HASH_MAP std::hash_map
|
|
||||||
|
|
||||||
#endif //( defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) )
|
|
||||||
|
|
||||||
#include "CStr.h"
|
#include "CStr.h"
|
||||||
#include "Vector3D.h"
|
#include "Vector3D.h"
|
||||||
|
|
||||||
#include <hash_map>
|
#ifndef __GNUC__
|
||||||
|
|
||||||
|
# include <hash_map>
|
||||||
|
|
||||||
|
# if( defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) )
|
||||||
|
# define STL_HASH_MAP stdext::hash_map
|
||||||
|
# else
|
||||||
|
# define STL_HASH_MAP std::hash_map
|
||||||
|
# endif //( defined( _MSC_VER ) && ( _MSC_VER >= 1300 ) )
|
||||||
|
|
||||||
|
#else // #ifndef __GNUC__
|
||||||
|
|
||||||
|
# include <ext/hash_map>
|
||||||
|
# define STL_HASH_MAP __gnu_cxx::hash_map
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
class CGenericProperty
|
class CGenericProperty
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user