diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2020-11-30 09:24:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 09:24:27 -0500 |
| commit | d38b709e42a7ce794780a469868b627a74fba396 (patch) | |
| tree | bde43a91221000b3a03a6aa77fc718e22a84215b | |
| parent | 0f8194210c7a3d1380e0409cb9cb6ec080887c71 (diff) | |
| parent | 6237037076eda3e26192d1cfa40c02553fdb703a (diff) | |
| download | sdl_ios-d38b709e42a7ce794780a469868b627a74fba396.tar.gz | |
Merge pull request #1856 from smartdevicelink/bugfix/issue-1834-generator-should-generator-enums-with-NS_TYPED_ENUM-instead-of-SDL_SWIFT_ENUM
Fix for using NS_TYPED_ENUM instead of SDL_SWIFT_ENUM
| -rw-r--r-- | generator/templates/SDLRPCFunctionNames.h.jinja2 | 2 | ||||
| -rw-r--r-- | generator/templates/SDLRPCParameterNames.h.jinja2 | 2 | ||||
| -rw-r--r-- | generator/templates/enums/template.h.jinja2 | 2 | ||||
| -rw-r--r-- | generator/templates/enums/template.m.jinja2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/generator/templates/SDLRPCFunctionNames.h.jinja2 b/generator/templates/SDLRPCFunctionNames.h.jinja2 index 5e13b735b..419081b51 100644 --- a/generator/templates/SDLRPCFunctionNames.h.jinja2 +++ b/generator/templates/SDLRPCFunctionNames.h.jinja2 @@ -6,7 +6,7 @@ /** * All RPC request / response / notification names */ -typedef SDLEnum SDLRPCFunctionName SDL_SWIFT_ENUM; +typedef SDLEnum SDLRPCFunctionName NS_TYPED_ENUM; {% for param in params %} {#- description if exist in source xml, will be putted here since if exist in source xml, will be putted here -#} diff --git a/generator/templates/SDLRPCParameterNames.h.jinja2 b/generator/templates/SDLRPCParameterNames.h.jinja2 index 7a5bbb746..93bf39c88 100644 --- a/generator/templates/SDLRPCParameterNames.h.jinja2 +++ b/generator/templates/SDLRPCParameterNames.h.jinja2 @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN -typedef NSString* SDLRPCParameterName SDL_SWIFT_ENUM; +typedef NSString* SDLRPCParameterName NS_TYPED_ENUM; {% for param in params %} extern SDLRPCParameterName const SDLRPCParameterName{{ param.name }}; {%- endfor %} diff --git a/generator/templates/enums/template.h.jinja2 b/generator/templates/enums/template.h.jinja2 index fb811fcd8..3d26960ec 100644 --- a/generator/templates/enums/template.h.jinja2 +++ b/generator/templates/enums/template.h.jinja2 @@ -7,7 +7,7 @@ {%- endblock -%} {%- block body %} {% include 'description.jinja2' %} -typedef SDLEnum {{ name }} SDL_SWIFT_ENUM{{ending}}; +typedef SDLEnum {{ name }} NS_TYPED_ENUM{{ending}}; {%- for param in params %} {%- include 'description_param.jinja2' %} extern {{ name }} const {{ name }}{{param.name}}{{ " __deprecated" if param.deprecated and param.deprecated }}; diff --git a/generator/templates/enums/template.m.jinja2 b/generator/templates/enums/template.m.jinja2 index e434bf758..fa82a9e44 100644 --- a/generator/templates/enums/template.m.jinja2 +++ b/generator/templates/enums/template.m.jinja2 @@ -3,7 +3,7 @@ #import "{{name}}.h" {%- block body %} {% if add_typedef %} -typedef SDLEnum {{name}} SDL_SWIFT_ENUM; +typedef SDLEnum {{name}} NS_TYPED_ENUM; {% endif -%} {%- for param in params %} {{ name }} const {{ name }}{{param.name}} = @"{{param.origin}}"; |