diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-01-05 16:29:24 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <brunoabinader@gmail.com> | 2018-01-09 13:24:46 +0000 |
| commit | 8dd711a9e9dd88195bc85d3e15b30dd1384aebae (patch) | |
| tree | 007415253c5180a0547590fb5588ce2300993a88 /src/3rdparty/earcut/earcut.hpp | |
| parent | 00483471fc14dc8a99fb64489358bdddb64bd676 (diff) | |
| download | qtlocation-8dd711a9e9dd88195bc85d3e15b30dd1384aebae.tar.gz | |
Use custom namespace in QtLocation's earcut
The custom namespace avoids clashes with mapbox-gl-native's own
earcut.hpp dependency.
Task-number: QTBUG-65262
Change-Id: Ic5121e88dca45c01af7ce26e38a99a0cd2d1c88e
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/3rdparty/earcut/earcut.hpp')
| -rw-r--r-- | src/3rdparty/earcut/earcut.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/earcut/earcut.hpp b/src/3rdparty/earcut/earcut.hpp index 287be028..ba3fb17a 100644 --- a/src/3rdparty/earcut/earcut.hpp +++ b/src/3rdparty/earcut/earcut.hpp @@ -9,7 +9,7 @@ #include <memory> #include <vector> -namespace mapbox { +namespace qt_mapbox { namespace util { @@ -771,7 +771,7 @@ void Earcut<N>::removeNode(Node* p) { template <typename N = uint32_t, typename Polygon> std::vector<N> earcut(const Polygon& poly) { - mapbox::detail::Earcut<N> earcut; + qt_mapbox::detail::Earcut<N> earcut; earcut(poly); return earcut.indices; } |