diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-01-14 22:38:54 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-01-14 22:38:54 +0000 |
| commit | 4756aa99f5756a6cac199c1aae6c37514cf1c562 (patch) | |
| tree | 6bb3182cb7668bdeca18aeb1a82b9182873c51cd /src/libnrtype | |
| parent | Remove "show transform handles" from prefs - no longer necessary (diff) | |
| download | inkscape-4756aa99f5756a6cac199c1aae6c37514cf1c562.tar.gz inkscape-4756aa99f5756a6cac199c1aae6c37514cf1c562.zip | |
Replace std::tr1::unordered_(map|set) with __gnu_cxx::hash_(map|set),
to work around broken headers in some GCC versions.
(bzr r8980)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 5 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index a63f70d75..afce4d849 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -26,10 +26,11 @@ /* Freetype2 */ # include <pango/pangoft2.h> -#include <tr1/unordered_map> +//#include <tr1/unordered_map> +#include <ext/hash_map> -typedef std::tr1::unordered_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; +typedef __gnu_cxx::hash_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; // need to avoid using the size field size_t font_descr_hash::operator()( PangoFontDescription *const &x) const { diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 6b0725b34..8b8eb8bbe 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -29,7 +29,8 @@ # include FT_TRUETYPE_TABLES_H # include <pango/pangoft2.h> -#include <tr1/unordered_map> +//#include <tr1/unordered_map> +#include <ext/hash_map> // the various raster_font in use at a given time are held in a hash_map whose indices are the @@ -43,7 +44,7 @@ struct font_style_equal : public std::binary_function<font_style, font_style, bo }; -typedef std::tr1::unordered_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; +typedef __gnu_cxx::hash_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; |