From 98c6987af4bca8815c9dbafb7da83c0e7c0a7a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 18 Aug 2016 15:57:10 -0700 Subject: [PATCH] [ios, macos] Removed unused code --- platform/darwin/src/MGLStyleAttributeFunction.h | 2 -- platform/darwin/src/MGLStyleAttributeValue_Private.h | 1 - platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm | 8 -------- .../src/NSValue+MGLStyleAttributeAdditions_Private.h | 3 --- 4 files changed, 14 deletions(-) diff --git a/platform/darwin/src/MGLStyleAttributeFunction.h b/platform/darwin/src/MGLStyleAttributeFunction.h index 71e15a321..e636c1add 100644 --- a/platform/darwin/src/MGLStyleAttributeFunction.h +++ b/platform/darwin/src/MGLStyleAttributeFunction.h @@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy) NS_DICTIONARY_OF(NSNumber *, id) *stops; -@property (nonatomic, copy, nullable) NSString *property; - @property (nonatomic, copy, nullable) NSNumber *base; @end diff --git a/platform/darwin/src/MGLStyleAttributeValue_Private.h b/platform/darwin/src/MGLStyleAttributeValue_Private.h index 3051f663d..4b8fd1cc0 100644 --- a/platform/darwin/src/MGLStyleAttributeValue_Private.h +++ b/platform/darwin/src/MGLStyleAttributeValue_Private.h @@ -17,7 +17,6 @@ - (mbgl::style::PropertyValue>)mbgl_paddingPropertyValue; - (mbgl::style::PropertyValue >)mbgl_stringArrayPropertyValue; - (mbgl::style::PropertyValue >)mbgl_numberArrayPropertyValue; -- (mbgl::style::PropertyValue)mbgl_enumPropertyValue; // Convert mbgl types to darwin types - (id )mbgl_colorPropertyValueWith:(mbgl::style::PropertyValue)color; diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm index 79038a66f..83266e7db 100644 --- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm +++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions.mm @@ -37,14 +37,6 @@ return NO; } -- (mbgl::style::PropertyValue)mbgl_enumPropertyValue -{ - NSAssert(strcmp(self.objCType, @encode(uint8_t)) == 0, @"Value does not represent a uint8_t"); - uint8_t value = 0; - [self getValue:&value]; - return mbgl::style::PropertyValue { value }; -} - - (mbgl::style::PropertyValue>)mbgl_offsetPropertyValue { return { self.mgl_offsetArrayValue }; diff --git a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h index 578e0ad9c..28a9b1090 100644 --- a/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h +++ b/platform/darwin/src/NSValue+MGLStyleAttributeAdditions_Private.h @@ -9,9 +9,6 @@ + (instancetype)mgl_valueWithOffsetArray:(std::array)offsetArray; + (instancetype)mgl_valueWithPaddingArray:(std::array)paddingArray; -- (mbgl::style::PropertyValue)mbgl_enumPropertyValue; -- (mbgl::style::PropertyValue>)mbgl_offsetPropertyValue; - - (std::array)mgl_offsetArrayValue; - (std::array)mgl_paddingArrayValue;