Breakpad: Don't use the deprecated __gnu_cxx::hash_map container.

Modern GNU compilers warn about the #inclusion of <ext/hash_map>; that
container is deprecated, and code should use <tr1/unordered_map>
instead.  However, to stay within the boundaries of C++ '98, it's
probably fine just to use plain old std::map.

Breakpad uses hash_map in three cases:

o The DWARF reader's SectionMap type maps object file section names to
  data.  This map is consulted once per section kind per DWARF
  compilation unit; it is not performance-critical.

o The Mac dump_syms tool uses it to map machine architectures to
  section maps in Universal binaries.  It's hard to imagine there
  ever being more than two entries in such a map.

o The processor's BasicSourceLineResolver uses a hash_map to map file
  numbers to file names.  This is the map that will probably have the
  most entries, but it's only accessed once per frame, after we've
  found the frame's line entry.

a=jimblandy
r=nealsid


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@393 4c0a9323-5329-0410-9bdc-e9ce6186880e

5 files changed, 3 insertions, 46 deletions

diff --git a/src/common/mac/dump_syms.h b/src/common/mac/dump_syms.h
index 12d8f7d6..5ed3e3b6 100644
--- a/src/common/mac/dump_syms.h
+++ b/src/common/mac/dump_syms.h
@@ -37,7 +37,7 @@
 
 // This will map from an architecture string to a SectionMap, which
 // will contain the offsets for all the sections in the dictionary
-typedef hash_map<string, dwarf2reader::SectionMap *> ArchSectionMap;
+typedef map<string, dwarf2reader::SectionMap *> ArchSectionMap;
 
 @interface DumpSymbols : NSObject {
  @protected
diff --git a/src/common/mac/dump_syms.mm b/src/common/mac/dump_syms.mm
index 73e4f76a..8f0b9fe1 100644
--- a/src/common/mac/dump_syms.mm
+++ b/src/common/mac/dump_syms.mm
@@ -68,15 +68,6 @@ static NSString *kHeaderCPUTypeKey = @"cpuType";
 // for pruning out extraneous non-function symbols.
 static const int kTextSection = 1;
 
-namespace __gnu_cxx {
-template<> 
-  struct hash<std::string> {
-    size_t operator()(const std::string& k) const {
-      return hash< const char* >()( k.c_str() );
-  }
-};
-}
-
 // Dump FunctionMap to stdout.  Print address, function name, file
 // name, line number, lowpc, and highpc if available.
 void DumpFunctionMap(const dwarf2reader::FunctionMap function_map) {
diff --git a/src/common/mac/dwarf/dwarf2reader.cc b/src/common/mac/dwarf/dwarf2reader.cc
index 6e7a2f1d..dd21561d 100644
--- a/src/common/mac/dwarf/dwarf2reader.cc
+++ b/src/common/mac/dwarf/dwarf2reader.cc
@@ -26,7 +26,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include <ext/hash_map>
 #include <stack>
 #include <utility>
 
@@ -35,17 +34,6 @@
 #include "common/mac/dwarf/bytereader.h"
 #include "common/mac/dwarf/line_state_machine.h"
 
-namespace __gnu_cxx
-{
-  template<> struct hash< std::string >
-  {
-    size_t operator()( const std::string& x ) const
-    {
-      return hash< const char* >()( x.c_str() );
-    }
-  };
-}
-
 namespace dwarf2reader {
 
 // Read a DWARF2/3 initial length field from START, using READER, and
diff --git a/src/common/mac/dwarf/dwarf2reader.h b/src/common/mac/dwarf/dwarf2reader.h
index f27cdac7..cb47d97f 100644
--- a/src/common/mac/dwarf/dwarf2reader.h
+++ b/src/common/mac/dwarf/dwarf2reader.h
@@ -36,8 +36,8 @@
 #ifndef COMMON_MAC_DWARF_DWARF2READER_H__
 #define COMMON_MAC_DWARF_DWARF2READER_H__
 
-#include <ext/hash_map>
 #include <list>
+#include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ -46,7 +46,6 @@
 #include "common/mac/dwarf/types.h"
 
 using namespace std;
-using namespace __gnu_cxx;
 
 namespace dwarf2reader {
 struct LineStateMachine;
@@ -56,7 +55,7 @@ class LineInfoHandler;
 
 // This maps from a string naming a section to a pair containing a
 // the data for the section, and the size of the section.
-typedef hash_map<string, pair<const char*, uint64> > SectionMap;
+typedef map<string, pair<const char*, uint64> > SectionMap;
 typedef list<pair<enum DwarfAttribute, enum DwarfForm> > AttributeList;
 typedef AttributeList::iterator AttributeIterator;
 typedef AttributeList::const_iterator ConstAttributeIterator;
diff --git a/src/common/mac/dwarf/functioninfo.cc b/src/common/mac/dwarf/functioninfo.cc
index 267d6cf9..3501c035 100644
--- a/src/common/mac/dwarf/functioninfo.cc
+++ b/src/common/mac/dwarf/functioninfo.cc
@@ -39,27 +39,6 @@
 #include "common/mac/dwarf/bytereader.h"
 
 
-namespace __gnu_cxx {
-
-// Implement a string hash function so that std::string can be used as a key
-// in STL maps and sets.  The hash algorithm comes from the GNU C++ library,
-// in <tr1/functional>.  It is duplicated here because GCC versions prior to
-// 4.3.2 are unable to compile <tr1/functional> when RTTI is disabled, as it
-// may be in this code.
-
-template<>
-struct hash<std::string> {
-  std::size_t operator()(const std::string& s) const {
-    std::size_t result = 0;
-    for (std::string::const_iterator i = s.begin(); i != s.end(); ++i)
-      result = (result * 131) + *i;
-    return result;
-  }
-};
-
-}  // namespace __gnu_cxx
-
-
 namespace dwarf2reader {
 
 // Given an offset value, its form, and the base offset of the