diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-03-02 22:52:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-03-02 22:52:32 +0000 |
| commit | 84fc09c9c921a31ac826c53e419d4ea61584f8a9 (patch) | |
| tree | 963de2de0cd357d863d3ba104167abef31683750 /src/libnrtype | |
| parent | Win32. Fix for Object Visible warning. (diff) | |
| download | inkscape-84fc09c9c921a31ac826c53e419d4ea61584f8a9.tar.gz inkscape-84fc09c9c921a31ac826c53e419d4ea61584f8a9.zip | |
Use Boost unordeed containers instead of TR1 to minimize pain
when using Apple compilers.
(bzr r9129)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 4 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 09d9e2c4f..d6fc207b0 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -26,9 +26,9 @@ /* Freetype2 */ # include <pango/pangoft2.h> -#include <tr1/unordered_map> +#include <boost/unordered_map.hpp> -typedef std::tr1::unordered_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; +typedef boost::unordered_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 628e3cba0..557e9106e 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -29,7 +29,7 @@ # include FT_TRUETYPE_TABLES_H # include <pango/pangoft2.h> -#include <tr1/unordered_map> +#include <boost/unordered_map.hpp> struct font_style_hash : public std::unary_function<font_style, size_t> { @@ -40,7 +40,7 @@ struct font_style_equal : public std::binary_function<font_style, font_style, bo bool operator()(font_style const &a, font_style const &b) const; }; -typedef std::tr1::unordered_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; +typedef boost::unordered_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; |