From c09ab354532b945feeaaa1bd30b505da574f2d2c Mon Sep 17 00:00:00 2001 From: olsner Date: Wed, 2 Jun 2004 16:28:12 +0000 Subject: [PATCH] Extended the hash_map kludge to detect gcc This was SVN commit r359. --- source/simulation/EntityProperties.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/source/simulation/EntityProperties.h b/source/simulation/EntityProperties.h index c4cc2a719e..0876b28526 100755 --- a/source/simulation/EntityProperties.h +++ b/source/simulation/EntityProperties.h @@ -15,20 +15,25 @@ #ifndef 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 "Vector3D.h" -#include +#ifndef __GNUC__ + +# include + +# 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 +# define STL_HASH_MAP __gnu_cxx::hash_map + +#endif class CGenericProperty {