From 84fc09c9c921a31ac826c53e419d4ea61584f8a9 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Tue, 2 Mar 2010 23:52:32 +0100 Subject: Use Boost unordeed containers instead of TR1 to minimize pain when using Apple compilers. (bzr r9129) --- src/libnrtype/FontFactory.cpp | 4 ++-- src/libnrtype/FontInstance.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libnrtype') 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 -#include +#include -typedef std::tr1::unordered_map FaceMapType; +typedef boost::unordered_map 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 -#include +#include struct font_style_hash : public std::unary_function { @@ -40,7 +40,7 @@ struct font_style_equal : public std::binary_function StyleMap; +typedef boost::unordered_map StyleMap; -- cgit v1.2.3