diff options
| author | KingPin <none@none> | 2008-11-10 20:11:14 -0600 |
|---|---|---|
| committer | KingPin <none@none> | 2008-11-10 20:11:14 -0600 |
| commit | 943b4b68b94691d02811c516f51bc608ed9ff76d (patch) | |
| tree | db6fb0b540803c55cbb1bac52d19601d9bc0174b /src | |
| parent | 73d1b07a91fea4f9422f532183c08f2ef679aaa8 (diff) | |
[svn] * GCC compile fix - Source Derex
* Cleanups
*** This revision made by ogres due to our Gnome engineers getting a little too drunk at yesterdays Trinity office party(It's true, would I lie to you?).
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/framework/Utilities/UnorderedMap.h | 2 | ||||
| -rw-r--r-- | src/game/Makefile.am | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMap.h index 17d1742fc6c..4af2a1ae74d 100644 --- a/src/framework/Utilities/UnorderedMap.h +++ b/src/framework/Utilities/UnorderedMap.h @@ -50,7 +50,7 @@ using std::hash_map; #elif COMPILER == COMPILER_GNU && __GNUC__ >= 4 #define UNORDERED_MAP std::tr1::unordered_map #elif COMPILER == COMPILER_GNU && __GNUC__ >= 3 -#define UNORDERED_MAP std::__gnu_cxx::hash_map +#define UNORDERED_MAP __gnu_cxx::hash_map namespace __gnu_cxx { diff --git a/src/game/Makefile.am b/src/game/Makefile.am index f79eede504e..ddadee44f9b 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -117,9 +117,6 @@ $(srcdir)/GlobalEvents.h \ $(srcdir)/GMTicketHandler.cpp \ $(srcdir)/GMTicketMgr.cpp \ $(srcdir)/GMTicketMgr.h \ -$(srcdir)/GMTicketHandler.cpp \ -$(srcdir)/GMTicketMgr.cpp \ -$(srcdir)/GMTicketMgr.h \ $(srcdir)/GossipDef.cpp \ $(srcdir)/GossipDef.h \ $(srcdir)/GridDefines.h \ |