From 723fa547cec84a3b14d5bbc997446269deaf5569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Mon, 3 Jun 2019 22:32:25 +0200 Subject: [core] fix warnings with Xcode 11's updated Clang version --- platform/darwin/src/collator.mm | 2 +- src/mbgl/renderer/render_tile.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/darwin/src/collator.mm b/platform/darwin/src/collator.mm index 6b6519d4b1..fe2b46ffa7 100644 --- a/platform/darwin/src/collator.mm +++ b/platform/darwin/src/collator.mm @@ -31,7 +31,7 @@ public: // https://developer.apple.com/documentation/foundation/nsstring/1414561-compare NSRange compareRange = NSMakeRange(0, nsLhs.length); - return [nsLhs compare:nsRhs options:options range:compareRange locale:locale]; + return static_cast([nsLhs compare:nsRhs options:options range:compareRange locale:locale]); } std::string resolvedLocale() const { diff --git a/src/mbgl/renderer/render_tile.hpp b/src/mbgl/renderer/render_tile.hpp index 9725744ace..6f78d2cd87 100644 --- a/src/mbgl/renderer/render_tile.hpp +++ b/src/mbgl/renderer/render_tile.hpp @@ -34,7 +34,7 @@ public: RenderTile(const RenderTile&) = delete; RenderTile(RenderTile&&) = default; RenderTile& operator=(const RenderTile&) = delete; - RenderTile& operator=(RenderTile&&) = default; + RenderTile& operator=(RenderTile&&) = delete; UnwrappedTileID id; mat4 matrix; -- cgit v1.2.1