diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-06-03 22:32:25 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-06-04 10:07:19 +0200 |
commit | 892699a39a7fb569a8536f96d2eecc89d0a4e904 (patch) | |
tree | 268c01147d13b6c581c414244bc6d2b21a7580a9 | |
parent | 6742017a9a272a362efac537c6fd3938d6e0c95c (diff) | |
download | qtlocation-mapboxgl-892699a39a7fb569a8536f96d2eecc89d0a4e904.tar.gz |
[core] fix warnings with Xcode 11's updated Clang version
-rw-r--r-- | platform/darwin/src/collator.mm | 2 | ||||
-rw-r--r-- | 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<int>([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; |