diff options
| author | MenTaLguY <mental@rydia.net> | 2006-07-21 03:15:49 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-07-21 03:15:49 +0000 |
| commit | 939b6dbe467a6f844b7a6791c64246ea6021aa2c (patch) | |
| tree | bcc89aa09e62e70ca172d7f60e4a0461e93bf5fd | |
| parent | minor changelog note (diff) | |
| download | inkscape-939b6dbe467a6f844b7a6791c64246ea6021aa2c.tar.gz inkscape-939b6dbe467a6f844b7a6791c64246ea6021aa2c.zip | |
replace two uses of hash_map with standard STL map
(bzr r1446)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/libnrtype/RasterFont.h | 4 | ||||
| -rw-r--r-- | src/libnrtype/font-instance.h | 3 |
3 files changed, 10 insertions, 3 deletions
@@ -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 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; |