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

diff --git a/include/hash_map.h b/include/hash_map.h
index 93341b5e0..e789ea66a 100644
--- a/include/hash_map.h
+++ b/include/hash_map.h
@@ -1,29 +1,44 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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
-
-#include "inspircd_config.h"
-
+ 
 	/** 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.
 	 */
-	#ifndef WIN32
-		#ifdef HASHMAP_DEPRECATED
+	#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 */
@@ -32,27 +47,13 @@
 			#define END_HASHMAP_NAMESPACE }
 		#endif
 	#else
-		#if _MSC_VER >= 1600
-			// New MSVC has tr1. Just to make things fucked up, though, MSVC and GCC use different includes! FFS.
-			#include <unordered_map>
-			#define HAS_TR1_UNORDERED
-			#define HASHMAP_DEPRECATED
-		#else
-			/** Oddball windows namespace for hash_map */
-			#include <hash_map>
-			#define nspace stdext
-			using stdext::hash_map;
-			#define BEGIN_HASHMAP_NAMESPACE namespace nspace {
-			#define END_HASHMAP_NAMESPACE }
-		#endif
-	#endif
-
-	// tr1: restoring sanity to our headers. now if only compiler vendors could agree on a FUCKING INCLUDE FILE.
-	#ifdef HAS_TR1_UNORDERED
+		#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
 
 #endif