From 939b6dbe467a6f844b7a6791c64246ea6021aa2c Mon Sep 17 00:00:00 2001 From: MenTaLguY Date: Fri, 21 Jul 2006 03:15:49 +0000 Subject: replace two uses of hash_map with standard STL map (bzr r1446) --- src/libnrtype/RasterFont.h | 4 ++-- src/libnrtype/font-instance.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libnrtype/RasterFont.h b/src/libnrtype/RasterFont.h index 03665c69a..10de23d1b 100644 --- a/src/libnrtype/RasterFont.h +++ b/src/libnrtype/RasterFont.h @@ -7,7 +7,7 @@ #ifndef my_raster_font #define my_raster_font -#include +#include #include #include @@ -22,7 +22,7 @@ public: font_style style; - __gnu_cxx::hash_map glyph_id_to_raster_glyph_no; + std::map 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 5d57ff549..ec58ce1d7 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -2,6 +2,7 @@ #define SEEN_LIBNRTYPE_FONT_INSTANCE_H #include +#include #include #include #include @@ -43,7 +44,7 @@ public: font_factory* daddy; // common glyph definitions for all the rasterfonts - __gnu_cxx::hash_map id_to_no; + std::map id_to_no; int nbGlyph, maxGlyph; font_glyph* glyphs; -- cgit v1.2.3