From 70d5972e104aac91f4198540d4af14562e92d555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Thu, 18 Oct 2018 17:57:04 +0200
Subject: [core] don't use <boost/functional/hash.hpp> to avoid <locale>
 include

---
 src/mbgl/layout/merge_lines.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/mbgl/layout')

diff --git a/src/mbgl/layout/merge_lines.cpp b/src/mbgl/layout/merge_lines.cpp
index 2a3afa42b2..616a8a3ff5 100644
--- a/src/mbgl/layout/merge_lines.cpp
+++ b/src/mbgl/layout/merge_lines.cpp
@@ -1,7 +1,6 @@
 #include <mbgl/layout/merge_lines.hpp>
 #include <mbgl/layout/symbol_feature.hpp>
-
-#include <boost/functional/hash.hpp>
+#include <mbgl/util/hash.hpp>
 
 namespace mbgl {
 namespace util {
@@ -43,10 +42,7 @@ size_t mergeFromLeft(std::vector<SymbolFeature>& features,
 }
 
 size_t getKey(const std::u16string& text, const GeometryCoordinate& coord) {
-    auto hash = std::hash<std::u16string>()(text);
-    boost::hash_combine(hash, coord.x);
-    boost::hash_combine(hash, coord.y);
-    return hash;
+    return util::hash(text, coord.x, coord.y);
 }
 
 void mergeLines(std::vector<SymbolFeature>& features) {
-- 
cgit v1.2.1