[Lldb-commits] [lldb] r161558 - /lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h

[Sean Callanan]

Author: spyffe
Date: Wed Aug  8 19:46:55 2012
New Revision: 161558

URL: http://llvm.org/viewvc/llvm-project?rev=161558&view=rev
Log:
When compiling with C++11, switch from
hash_multimap to unordered_multimap.

<rdar://problem/11930775>

Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h?rev=161558&r1=161557&r2=161558&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h Wed Aug  8 19:46:55 2012
@@ -13,7 +13,11 @@
 #include "SymbolFileDWARF.h"
 #include <string>
 #include <vector>
+#if __cplusplus >= 201103L
+#include <unordered_map>
+#else
 #include <ext/hash_map>
+#endif
 
 class DWARFDebugPubnamesSet
 {
@@ -83,7 +87,11 @@
 
     dw_offset_t     m_offset;
     Header          m_header;
+#if __cplusplus >= 201103L
+    typedef std::unordered_multimap<const char*, uint32_t, std::hash<const char*>, CStringEqualBinaryPredicate> cstr_to_index_mmap;
+#else
     typedef __gnu_cxx::hash_multimap<const char*, uint32_t, __gnu_cxx::hash<const char*>, CStringEqualBinaryPredicate> cstr_to_index_mmap;
+#endif
     DescriptorColl  m_descriptors;
     mutable cstr_to_index_mmap m_name_to_descriptor_index;
 };