diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2018-10-18 17:57:04 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2018-10-23 12:23:40 +0200 |
commit | 70d5972e104aac91f4198540d4af14562e92d555 (patch) | |
tree | 83e92385784d2c89df052690cd3a15ad1ca3eb01 /src/mbgl/layout | |
parent | 282c71e8e9a8ec9c2eab612f2e60a71b15d24c8a (diff) | |
download | qtlocation-mapboxgl-70d5972e104aac91f4198540d4af14562e92d555.tar.gz |
[core] don't use <boost/functional/hash.hpp> to avoid <locale> include
Diffstat (limited to 'src/mbgl/layout')
-rw-r--r-- | src/mbgl/layout/merge_lines.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
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) { |