summaryrefslogtreecommitdiffstats
path: root/src/util/units.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-10-18 22:53:43 +0000
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-10-18 23:26:26 +0000
commitddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651 (patch)
tree9c91b6224ee6af12f030f03635f52b654db59840 /src/util/units.cpp
parentMerge branch 'bugfix-1789838-confirmation-needed-before-overwriting-template'... (diff)
downloadinkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.tar.gz
inkscape-ddffc1a8ab9e3357a8e0350ff08b5ef1a9fb2651.zip
Remove util/unordered-containers.h aliases.
Diffstat (limited to 'src/util/units.cpp')
-rw-r--r--src/util/units.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp
index 35493bcbc..0308623d5 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -14,6 +14,7 @@
#include <iomanip>
#include <iostream>
#include <utility>
+#include <unordered_map>
#include <glib.h>
#include <glibmm/regex.h>
#include <glibmm/fileutils.h>
@@ -81,7 +82,7 @@ unsigned const svg_length_lookup[] = {
// maps unit codes obtained from their abbreviations to their SVGLength unit indexes
-typedef INK_UNORDERED_MAP<unsigned, SVGLength::Unit> UnitCodeLookup;
+typedef std::unordered_map<unsigned, SVGLength::Unit> UnitCodeLookup;
UnitCodeLookup make_unit_code_lookup()
{
@@ -96,7 +97,7 @@ UnitCodeLookup const unit_code_lookup = make_unit_code_lookup();
-typedef INK_UNORDERED_MAP<Glib::ustring, Inkscape::Util::UnitType> TypeMap;
+typedef std::unordered_map<Glib::ustring, Inkscape::Util::UnitType> TypeMap;
/** A std::map that gives the data type value for the string version.
* @todo consider hiding map behind hasFoo() and getFoo() type functions. */