diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-03-04 08:44:53 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-03-04 08:44:53 +0000 |
| commit | 46fd0e8c49da44226151096546905589819bbdf5 (patch) | |
| tree | c9f48e2a3dfbf78059b8fdb236f4ff08ef6ca494 /src/libnrtype | |
| parent | Removed unused static pixmap reference. (diff) | |
| download | inkscape-46fd0e8c49da44226151096546905589819bbdf5.tar.gz inkscape-46fd0e8c49da44226151096546905589819bbdf5.zip | |
Fixing build breakage with more proper autoconf usage.
(bzr r9138)
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 d6fc207b0..8ab2ee696 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -26,9 +26,9 @@ /* Freetype2 */ # include <pango/pangoft2.h> -#include <boost/unordered_map.hpp> +#include "util/set-types.h" -typedef boost::unordered_map<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; +typedef optim_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 557e9106e..61cd28190 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 <boost/unordered_map.hpp> +#include "util/set-types.h" 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 boost::unordered_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; +typedef optim_map<font_style, raster_font*, font_style_hash, font_style_equal> StyleMap; |