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/gpgpu-sim/gpu-cache.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpgpu-sim/gpu-cache.h') diff --git a/src/gpgpu-sim/gpu-cache.h b/src/gpgpu-sim/gpu-cache.h index ecb1059..3f67ffe 100644 --- a/src/gpgpu-sim/gpu-cache.h +++ b/src/gpgpu-sim/gpu-cache.h @@ -275,9 +275,9 @@ class mshr_table { public: mshr_table( unsigned num_entries, unsigned max_merged ) : m_num_entries(num_entries), - m_max_merged(max_merged), -#ifndef USE_MAP - m_data(2*num_entries) + m_max_merged(max_merged) +#if (tr1_hash_map_ismap == 0) + ,m_data(2*num_entries) #endif { } @@ -377,7 +377,7 @@ private: bool m_has_atomic; mshr_entry() : m_has_atomic(false) { } }; - typedef my_hash_map table; + typedef tr1_hash_map table; table m_data; // it may take several cycles to process the merged requests -- cgit v1.3