From 2e04480f21298262daa5c6d9b0d1b24c52f00756 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 4 Jan 2013 18:22:29 +0000 Subject: Use the preprocessor to detect whether hash_map is available. --- include/hash_map.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/hash_map.h') diff --git a/include/hash_map.h b/include/hash_map.h index 6be2da6ca..1b43f0118 100644 --- a/include/hash_map.h +++ b/include/hash_map.h @@ -22,17 +22,19 @@ #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 __GLIBCXX__ > 20060309 // GCC4+ has deprecated hash_map and uses tr1. But of course, uses a different include to MSVC. FOR FUCKS SAKE. #include #define HAS_TR1_UNORDERED + #define HASHMAP_DEPRECATED #else #include /** Oddball linux namespace for hash_map */ -- cgit v1.2.3