From 943b4b68b94691d02811c516f51bc608ed9ff76d Mon Sep 17 00:00:00 2001
From: KingPin <none@none>
Date: Mon, 10 Nov 2008 20:11:14 -0600
Subject: [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
---
 src/framework/Utilities/UnorderedMap.h | 2 +-
 src/game/Makefile.am                   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'src')

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 \
-- 
cgit v1.2.3