From ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Fri, 19 Oct 2018 00:53:43 +0200
Subject: Remove util/unordered-containers.h aliases.

---
 src/libnrtype/FontFactory.cpp  | 5 +++--
 src/libnrtype/FontInstance.cpp | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libnrtype')

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
-- 
cgit v1.2.3