X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fhash_map.h;h=e789ea66a72875227daebe7a2b88d8dd38d9fb8d;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=f49b6a68ba5d3cf642d41806739c64e6dcf8b76b;hpb=f209cce90b394acd26e22eacef0bff61e8f5b4e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/hash_map.h b/include/hash_map.h
index f49b6a68b..e789ea66a 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -1,45 +1,59 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #ifndef INSPIRCD_HASHMAP_H
 #define INSPIRCD_HASHMAP_H
-
-/** Where hash_map is varies from compiler to compiler
- * as it is not standard unless we have tr1.
- */
-#ifndef WIN32
-	#ifndef HASHMAP_DEPRECATED
-		#include <ext/hash_map>
-		/** Oddball linux namespace for hash_map */
-		#define nspace __gnu_cxx
-		#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
-		#define END_HASHMAP_NAMESPACE }
+ 
+	/** Where hash_map is varies from compiler to compiler
+	 * as it is not standard unless we have tr1.
+	 *
+	 * TODO: in 2.2 if we drop support for libstdc++ older than 3.4.7 and GCC older
+	 *       than 4.1 this can be cleaned up massively.
+	 */
+	#if !defined _LIBCPP_VERSION && !defined _WIN32
+		#if !defined __GLIBCXX__ || __GLIBCXX__ > 20060309
+			// GCC4+ has deprecated hash_map and uses tr1. But of course, uses a different include to MSVC. FOR FUCKS SAKE.
+			#include <tr1/unordered_map>
+			#define HAS_TR1_UNORDERED
+			#define HASHMAP_DEPRECATED
+			#define hash_map unordered_map
+			#define nspace std::tr1
+			#define BEGIN_HASHMAP_NAMESPACE namespace std { namespace tr1 {
+			#define END_HASHMAP_NAMESPACE } }
+		#else
+			#include <ext/hash_map>
+			/** Oddball linux namespace for hash_map */
+			#define nspace __gnu_cxx
+			#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
+			#define END_HASHMAP_NAMESPACE }
+		#endif
 	#else
-		/** Yay, we have tr1! */
-		#include <tr1/unordered_map>
-		/** Not so oddball linux namespace for hash_map with gcc 4.0 and above */
+		#include <unordered_map>
+		#define HAS_TR1_UNORDERED
+		#define HASHMAP_DEPRECATED
 		#define hash_map unordered_map
-		#define nspace std::tr1
-		#define BEGIN_HASHMAP_NAMESPACE namespace std { namespace tr1 {
-		#define END_HASHMAP_NAMESPACE } }
+		#define nspace std
+		#define BEGIN_HASHMAP_NAMESPACE namespace std {
+		#define END_HASHMAP_NAMESPACE }
 	#endif
-#else
-	#include <hash_map>
-	#define nspace stdext
-	/** Oddball windows namespace for hash_map */
-	using stdext::hash_map;
-	#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
-	#define END_HASHMAP_NAMESPACE }
-#endif
 
 #endif