replace two uses of hash_map with standard STL map

diff --git a/ChangeLog b/ChangeLog
index d0c204fc7af287e6a26630c6c92ff746a1904979..7304f0b1137ddf1ca9be0c3ae3eee4f70a24d065 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-20  MenTaLguY  <mental@rydia.net>
+
+       * src/libnrtype/RasterFont.h, src/libnrtype/font-instance.h:
+
+         replace two uses of hash_map with standard STL map
+
 2006-07-18  Bryce Harrington <bryce@bryceharrington.org>
        * src/document.h, src/document.cpp:  Refactoring from mental &
          bryce to consolidate document update functionality from

diff --git a/src/libnrtype/RasterFont.h b/src/libnrtype/RasterFont.h
index 03665c69a736529cd622b3e510fe7cd90508be90..10de23d1b215f2fedf77c91f7e65d5b588351735 100644 (file)
--- a/src/libnrtype/RasterFont.h
+++ b/src/libnrtype/RasterFont.h
@@ -7,7 +7,7 @@
 #ifndef my_raster_font
 #define my_raster_font
 
-#include <ext/hash_map>
+#include <map>
 
 #include <libnr/nr-forward.h>
 #include <libnrtype/nrtype-forward.h>
@@ -22,7 +22,7 @@ public:
 
     font_style                    style;  
 
-    __gnu_cxx::hash_map<int,int>             glyph_id_to_raster_glyph_no;
+    std::map<int,int>             glyph_id_to_raster_glyph_no;
                // an array of glyphs in this rasterfont.
                // it's a bit redundant with the one in the daddy font_instance, but these glyphs
                // contains the real rasterization data

diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 5d57ff5499e2a92eb64c4f9ec425f05e4e24140e..ec58ce1d783abe8f88d3a333a4b9510e43ba56c3 100644 (file)
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -2,6 +2,7 @@
 #define SEEN_LIBNRTYPE_FONT_INSTANCE_H
 
 #include <ext/hash_map>
+#include <map>
 #include <pango/pango-types.h>
 #include <pango/pango-font.h>
 #include <require-config.h>
@@ -43,7 +44,7 @@ public:
     font_factory*         daddy;
 
     // common glyph definitions for all the rasterfonts
-    __gnu_cxx::hash_map<int, int>     id_to_no;
+    std::map<int, int>    id_to_no;
     int                   nbGlyph, maxGlyph;
     font_glyph*           glyphs;