diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnrtype/RasterFont.h | 4 | ||||
| -rw-r--r-- | src/libnrtype/font-instance.h | 3 |
2 files changed, 4 insertions, 3 deletions
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 <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 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 <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; |