diff options
author | Joel Fischer <joeljfischer@gmail.com> | 2017-08-22 18:56:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-22 18:56:51 -0400 |
commit | 2a68f4bfd314211c79b9e5eb893f1d8de954f944 (patch) | |
tree | 92694becb99d13125125f3fc7414d7cfbecf2bce | |
parent | e6848c716f3b0768ded3c298c5c67a5ecbd8a855 (diff) | |
parent | 04cdab2853de9b62a607119eed2f4185385238c8 (diff) | |
download | sdl_ios-2a68f4bfd314211c79b9e5eb893f1d8de954f944.tar.gz |
Merge pull request #702 from smartdevicelink/bugfix/issue_700_remove_metadatatype_none_5.0.0
Fix SDLMetadataType including NONE
-rw-r--r-- | SmartDeviceLink/SDLMetadataType.h | 5 | ||||
-rw-r--r-- | SmartDeviceLink/SDLMetadataType.m | 1 | ||||
-rw-r--r-- | SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/SmartDeviceLink/SDLMetadataType.h b/SmartDeviceLink/SDLMetadataType.h index cc6518b1c..c5a309412 100644 --- a/SmartDeviceLink/SDLMetadataType.h +++ b/SmartDeviceLink/SDLMetadataType.h @@ -73,8 +73,3 @@ extern SDLMetadataType const SDLMetadataTypeWeatherTerm; */ extern SDLMetadataType const SDLMetadataTypeHumidity; -/** - The data in this field is not of a common type or should not be processed. Any time a field does not have a type parameter it is considered as the none type. - */ -extern SDLMetadataType const SDLMetadataTypeNone; - diff --git a/SmartDeviceLink/SDLMetadataType.m b/SmartDeviceLink/SDLMetadataType.m index ad032569b..22e846ccc 100644 --- a/SmartDeviceLink/SDLMetadataType.m +++ b/SmartDeviceLink/SDLMetadataType.m @@ -20,4 +20,3 @@ SDLMetadataType const SDLMetadataTypeMaximumTemperature = @"maximumTemperature"; SDLMetadataType const SDLMetadataTypeMinimumTemperature = @"minimumTemperature"; SDLMetadataType const SDLMetadataTypeWeatherTerm = @"weatherTerm"; SDLMetadataType const SDLMetadataTypeHumidity = @"humidity"; -SDLMetadataType const SDLMetadataTypeNone = @"none"; diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m index 1ede591ee..0ef9bc45f 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLMetadataTypeSpec.m @@ -29,7 +29,6 @@ describe(@"Individual Enum Value Tests", ^ { expect(SDLMetadataTypeMinimumTemperature).to(equal(@"minimumTemperature")); expect(SDLMetadataTypeWeatherTerm).to(equal(@"weatherTerm")); expect(SDLMetadataTypeHumidity).to(equal(@"humidity")); - expect(SDLMetadataTypeNone).to(equal(@"none")); }); }); |