diff options
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/test/render_test_collator.cpp | 4 | ||||
-rw-r--r-- | platform/darwin/src/MGLAccountManager.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLConversion.h | 2 | ||||
-rw-r--r-- | platform/darwin/src/MGLStyleValue_Private.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/src/test/render_test_collator.cpp b/platform/android/src/test/render_test_collator.cpp index e6e3b27b48..9c0e4bece5 100644 --- a/platform/android/src/test/render_test_collator.cpp +++ b/platform/android/src/test/render_test_collator.cpp @@ -10,9 +10,9 @@ public: Impl(bool caseSensitive_, bool diacriticSensitive_, optional<std::string>) : caseSensitive(caseSensitive_), diacriticSensitive(diacriticSensitive_) {} - bool operator==(const Impl& other) const { return true; } + bool operator==(const Impl&) const { return true; } - int compare(const std::string& lhs, const std::string& rhs) const { return 0; } + int compare(const std::string&, const std::string&) const { return 0; } std::string resolvedLocale() const { return ""; } diff --git a/platform/darwin/src/MGLAccountManager.h b/platform/darwin/src/MGLAccountManager.h index 0d833a7ba7..d1983a4ddc 100644 --- a/platform/darwin/src/MGLAccountManager.h +++ b/platform/darwin/src/MGLAccountManager.h @@ -34,7 +34,7 @@ MGL_EXPORT and the type `String`. Alternatively, you may call this method from your application delegate’s `-applicationDidFinishLaunching:` method. */ -@property (class, nullable) NSString *accessToken; +@property (class, assign, nullable) NSString *accessToken; @end diff --git a/platform/darwin/src/MGLConversion.h b/platform/darwin/src/MGLConversion.h index d6de4151b9..3f7ffdd0c1 100644 --- a/platform/darwin/src/MGLConversion.h +++ b/platform/darwin/src/MGLConversion.h @@ -124,7 +124,7 @@ public: } } - static optional<GeoJSON> toGeoJSON(const Holder& holder, Error& error) { + static optional<GeoJSON> toGeoJSON(const Holder&, Error& error) { error = { "toGeoJSON not implemented" }; return {}; } diff --git a/platform/darwin/src/MGLStyleValue_Private.h b/platform/darwin/src/MGLStyleValue_Private.h index 82ce232c6b..b339dc8026 100644 --- a/platform/darwin/src/MGLStyleValue_Private.h +++ b/platform/darwin/src/MGLStyleValue_Private.h @@ -140,7 +140,7 @@ private: // Private utilities for converting from mgl to mbgl values class = typename std::enable_if<!std::is_enum<MBGLEnum>::value>::type, typename MGLEnum = ObjCEnum, class = typename std::enable_if<!std::is_enum<MGLEnum>::value>::type> - NSObject* toRawStyleSpecValue(NSObject *rawMGLValue, MBGLEnum &mbglValue) { + NSObject* toRawStyleSpecValue(NSObject *rawMGLValue, MBGLEnum &) { if ([rawMGLValue isKindOfClass:[NSValue class]]) { const auto rawNSValue = (NSValue *)rawMGLValue; if (strcmp([rawNSValue objCType], @encode(CGVector)) == 0) { @@ -157,13 +157,13 @@ private: // Private utilities for converting from mgl to mbgl values class = typename std::enable_if<std::is_enum<MBGLEnum>::value>::type, typename MGLEnum = ObjCEnum, class = typename std::enable_if<std::is_enum<MGLEnum>::value>::type> - NSString* toRawStyleSpecValue(ObjCType rawValue, MBGLEnum &mbglValue) { + NSString* toRawStyleSpecValue(ObjCType rawValue, MBGLEnum &) { MGLEnum mglEnum; [rawValue getValue:&mglEnum]; return @(mbgl::Enum<MGLEnum>::toString(mglEnum)); } - NSObject* toRawStyleSpecValue(MGLColor *color, MBGLType &mbglValue) { + NSObject* toRawStyleSpecValue(MGLColor *color, MBGLType &) { return @(color.mgl_color.stringify().c_str()); } |