From 9a0e4e4a776a963c9950dc3dcd0d23ee0739b755 Mon Sep 17 00:00:00 2001 From: Wilson Fung Date: Thu, 26 Jul 2012 03:22:53 -0800 Subject: Clean up the unordered_map fallback support. - Now there is only one macro for all use of unordered_map in the code. - Moving all instances of gcc/cuda version detection into a single file. - Adding a warning when the fallback is triggered. [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13542] --- src/abstract_hardware_model.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/abstract_hardware_model.h') diff --git a/src/abstract_hardware_model.h b/src/abstract_hardware_model.h index bb5c490..d9f5885 100644 --- a/src/abstract_hardware_model.h +++ b/src/abstract_hardware_model.h @@ -90,29 +90,6 @@ struct dim3 { }; #endif -#if 0 - -// detect gcc 4.3 and use unordered map (part of c++0x) -// unordered map doesn't play nice with _GLIBCXX_DEBUG, just use a map if its enabled. -#if defined( __GNUC__ ) and not defined( _GLIBCXX_DEBUG ) -#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 - #include - #define my_hash_map std::unordered_map -#else - #include - namespace std { - using namespace __gnu_cxx; - } - #define my_hash_map std::hash_map -#endif -#else - #include - #define my_hash_map std::map - #define USE_MAP -#endif - -#endif - void increment_x_then_y_then_z( dim3 &i, const dim3 &bound); class kernel_info_t { -- cgit v1.3