diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-17 13:49:10 -0700 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2016-10-17 13:49:10 -0700 |
| commit | c43f0254bee1f4050c3a82ba9cc40f5e6f85d25e (patch) | |
| tree | 9959581885ec7cb1239bf19fedfa88f4255e3547 /SmartDeviceLink/SDLResetGlobalProperties.h | |
| parent | ba7781297459eabeba7e409343920f938f0c42bd (diff) | |
| parent | 9e2a273e0730526dc195a1a6dd7d5ccfb00ab55a (diff) | |
| download | sdl_ios-c43f0254bee1f4050c3a82ba9cc40f5e6f85d25e.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/issue_425_stringly_typed_enum
* origin/develop:
Added missing generics
# Conflicts:
# SmartDeviceLink/SDLDisplayCapabilities.h
# SmartDeviceLink/SDLDisplayCapabilities.m
# SmartDeviceLink/SDLError.m
# SmartDeviceLink/SDLHMIPermissions.m
# SmartDeviceLink/SDLImageField.h
# SmartDeviceLink/SDLImageField.m
# SmartDeviceLink/SDLKeyboardProperties.h
# SmartDeviceLink/SDLOnTouchEvent.h
# SmartDeviceLink/SDLPerformAudioPassThru.h
# SmartDeviceLink/SDLPerformInteraction.h
# SmartDeviceLink/SDLRPCStruct.m
# SmartDeviceLink/SDLRegisterAppInterface.h
# SmartDeviceLink/SDLRegisterAppInterface.m
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.h
# SmartDeviceLink/SDLRegisterAppInterfaceResponse.m
# SmartDeviceLink/SDLResetGlobalProperties.m
# SmartDeviceLink/SDLShow.h
Diffstat (limited to 'SmartDeviceLink/SDLResetGlobalProperties.h')
| -rw-r--r-- | SmartDeviceLink/SDLResetGlobalProperties.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLResetGlobalProperties.h b/SmartDeviceLink/SDLResetGlobalProperties.h index ec4e37f1b..8131f0008 100644 --- a/SmartDeviceLink/SDLResetGlobalProperties.h +++ b/SmartDeviceLink/SDLResetGlobalProperties.h @@ -4,6 +4,8 @@ #import "SDLRPCRequest.h" +#import "SDLGlobalProperty.h" + /** * Resets the passed global properties to their default values as defined by * SDL @@ -26,6 +28,6 @@ * @abstract An array of one or more GlobalProperty enumeration elements * indicating which global properties to reset to their default value */ -@property (strong) NSMutableArray *properties; +@property (strong) NSMutableArray<SDLGlobalProperty> *properties; @end |