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/ui/tool/control-point-selection.h  | 9 +++++----
 src/ui/tool/multi-path-manipulator.cpp | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index 192e273e0..046b98649 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -14,13 +14,14 @@
 
 #include <list>
 #include <memory>
+#include <unordered_map>
+#include <unordered_set>
 #include <boost/optional.hpp>
 #include <cstddef>
 #include <sigc++/sigc++.h>
 #include <2geom/forward.h>
 #include <2geom/point.h>
 #include <2geom/rect.h>
-#include "util/unordered-containers.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
 #include "snap-candidate.h"
@@ -42,7 +43,7 @@ class ControlPointSelection : public Manipulator, public sigc::trackable {
 public:
     ControlPointSelection(SPDesktop *d, SPCanvasGroup *th_group);
     ~ControlPointSelection() override;
-    typedef INK_UNORDERED_SET<SelectableControlPoint *> set_type;
+    typedef std::unordered_set<SelectableControlPoint *> set_type;
     typedef set_type Set; // convenience alias
 
     typedef set_type::iterator iterator;
@@ -144,8 +145,8 @@ private:
     set_type _points;
 
     set_type _all_points;
-    INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Point> _original_positions;
-    INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Affine> _last_trans;
+    std::unordered_map<SelectableControlPoint *, Geom::Point> _original_positions;
+    std::unordered_map<SelectableControlPoint *, Geom::Affine> _last_trans;
     boost::optional<double> _rot_radius;
     boost::optional<double> _mouseover_rot_radius;
     Geom::OptRect _bounds;
diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp
index dd700d9b3..a92b129e9 100644
--- a/src/ui/tool/multi-path-manipulator.cpp
+++ b/src/ui/tool/multi-path-manipulator.cpp
@@ -10,6 +10,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <unordered_set>
+
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
 
@@ -39,13 +41,13 @@ struct hash_nodelist_iterator
     : public std::unary_function<NodeList::iterator, std::size_t>
 {
     std::size_t operator()(NodeList::iterator i) const {
-        return INK_HASH<NodeList::iterator::pointer>()(&*i);
+        return std::hash<NodeList::iterator::pointer>()(&*i);
     }
 };
 
 typedef std::pair<NodeList::iterator, NodeList::iterator> IterPair;
 typedef std::vector<IterPair> IterPairList;
-typedef INK_UNORDERED_SET<NodeList::iterator, hash_nodelist_iterator> IterSet;
+typedef std::unordered_set<NodeList::iterator, hash_nodelist_iterator> IterSet;
 typedef std::multimap<double, IterPair> DistanceMap;
 typedef std::pair<double, IterPair> DistanceMapItem;
 
-- 
cgit v1.2.3