diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 15:18:27 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-26 17:57:38 +0200 |
commit | f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed (patch) | |
tree | 31102ca2b739d2b21fcfc231585830969f2b4fa4 /src/mbgl/renderer/fill_bucket.cpp | |
parent | fdf6026e6249f99b260f15ec672a35c7e9db950d (diff) | |
download | qtlocation-mapboxgl-f4707f72e0ce7f1c40337c72ae5c0c0c8ef0efed.tar.gz |
Replace mbgl::util::make_unique<> with std::make_unique<>
Diffstat (limited to 'src/mbgl/renderer/fill_bucket.cpp')
-rw-r--r-- | src/mbgl/renderer/fill_bucket.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index c59b0970e0..a98a8b7cdf 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -7,7 +7,6 @@ #include <mbgl/shader/plain_shader.hpp> #include <mbgl/shader/pattern_shader.hpp> #include <mbgl/shader/outline_shader.hpp> -#include <mbgl/util/std.hpp> #include <mbgl/platform/gl.hpp> #include <mbgl/platform/log.hpp> @@ -107,7 +106,7 @@ void FillBucket::tessellate() { if (!lineGroups.size() || (lineGroups.back()->vertex_length + total_vertex_count > 65535)) { // Move to a new group because the old one can't hold the geometry. - lineGroups.emplace_back(util::make_unique<LineGroup>()); + lineGroups.emplace_back(std::make_unique<LineGroup>()); } assert(lineGroups.back()); @@ -154,7 +153,7 @@ void FillBucket::tessellate() { if (!triangleGroups.size() || (triangleGroups.back()->vertex_length + total_vertex_count > 65535)) { // Move to a new group because the old one can't hold the geometry. - triangleGroups.emplace_back(util::make_unique<TriangleGroup>()); + triangleGroups.emplace_back(std::make_unique<TriangleGroup>()); } // We're generating triangle fans, so we always start with the first |