Merge remote-tracking branch 'origin/master' into new-labelling

Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite

1 files changed, 13 insertions, 14 deletions

diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index 722a520027..977b6e565f 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -27,7 +27,6 @@
 #include <mbgl/shader/gaussian_shader.hpp>
 #include <mbgl/shader/box_shader.hpp>
 
-#include <mbgl/util/std.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/mat3.hpp>
 
@@ -95,19 +94,19 @@ void Painter::setup() {
 }
 
 void Painter::setupShaders() {
-    if (!plainShader) plainShader = util::make_unique<PlainShader>();
-    if (!outlineShader) outlineShader = util::make_unique<OutlineShader>();
-    if (!lineShader) lineShader = util::make_unique<LineShader>();
-    if (!linesdfShader) linesdfShader = util::make_unique<LineSDFShader>();
-    if (!linepatternShader) linepatternShader = util::make_unique<LinepatternShader>();
-    if (!patternShader) patternShader = util::make_unique<PatternShader>();
-    if (!iconShader) iconShader = util::make_unique<IconShader>();
-    if (!rasterShader) rasterShader = util::make_unique<RasterShader>();
-    if (!sdfGlyphShader) sdfGlyphShader = util::make_unique<SDFGlyphShader>();
-    if (!sdfIconShader) sdfIconShader = util::make_unique<SDFIconShader>();
-    if (!dotShader) dotShader = util::make_unique<DotShader>();
-    if (!gaussianShader) gaussianShader = util::make_unique<GaussianShader>();
-    if (!collisionBoxShader) collisionBoxShader = util::make_unique<CollisionBoxShader>();
+    if (!plainShader) plainShader = std::make_unique<PlainShader>();
+    if (!outlineShader) outlineShader = std::make_unique<OutlineShader>();
+    if (!lineShader) lineShader = std::make_unique<LineShader>();
+    if (!linesdfShader) linesdfShader = std::make_unique<LineSDFShader>();
+    if (!linepatternShader) linepatternShader = std::make_unique<LinepatternShader>();
+    if (!patternShader) patternShader = std::make_unique<PatternShader>();
+    if (!iconShader) iconShader = std::make_unique<IconShader>();
+    if (!rasterShader) rasterShader = std::make_unique<RasterShader>();
+    if (!sdfGlyphShader) sdfGlyphShader = std::make_unique<SDFGlyphShader>();
+    if (!sdfIconShader) sdfIconShader = std::make_unique<SDFIconShader>();
+    if (!dotShader) dotShader = std::make_unique<DotShader>();
+    if (!gaussianShader) gaussianShader = std::make_unique<GaussianShader>();
+    if (!collisionBoxShader) collisionBoxShader = std::make_unique<CollisionBoxShader>();
 }
 
 void Painter::resize() {