diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-18 22:53:43 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-10-18 23:26:26 +0000 |
| commit | ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651 (patch) | |
| tree | 9c91b6224ee6af12f030f03635f52b654db59840 /src/libnrtype | |
| parent | Merge branch 'bugfix-1789838-confirmation-needed-before-overwriting-template'... (diff) | |
| download | inkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.tar.gz inkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.zip | |
Remove util/unordered-containers.h aliases.
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 5 | ||||
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index cfa37bb97..74b68fc3f 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -16,6 +16,8 @@ #define PANGO_ENABLE_ENGINE #endif +#include <unordered_map> + #include <glibmm/i18n.h> #include <fontconfig/fontconfig.h> @@ -25,13 +27,12 @@ #include <pango/pango-ot.h> #include "io/sys.h" -#include "util/unordered-containers.h" #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" #include "libnrtype/OpenTypeUtil.h" -typedef INK_UNORDERED_MAP<PangoFontDescription*, font_instance*, font_descr_hash, font_descr_equal> FaceMapType; +typedef std::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 88339a60e..7358deac0 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -32,7 +32,6 @@ #include <2geom/path-sink.h> #include "libnrtype/font-glyph.h" #include "libnrtype/font-instance.h" -#include "util/unordered-containers.h" #ifndef USE_PANGO_WIN32 |