Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add APIs to SDLTemplateConfiguration for Objective-C++ compatibility #1485

Merged
merged 3 commits into from Jan 3, 2020

Conversation

joeljfischer
Copy link
Contributor

@joeljfischer joeljfischer commented Dec 3, 2019

Fixes #1478

This PR is ready for review.

Risk

This PR makes minor API changes.

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have run the unit tests with this PR
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).

Unit Tests

No unit tests were added, this was a compile time issue

Core Tests

No Core tests were performed because this was a compile time issue. Tests were performed internal to the project.

Core version / branch / commit hash / module tested against: n/a
HMI name / version / branch / commit hash / module tested against: n/a

Summary

This PR adds conditional compilation if the app is using Objective-C++ to change SDLTemplateConfiguration.template to .templateName because template is a C++ keyword. This is a minor version change due to APIs being added in Objective-C++ projects.

Changelog

Bug Fixes
  • Fix Objective-C++ projects not compiling due to keyword usage.

CLA

@joeljfischer joeljfischer added the bug A defect in the library label Dec 3, 2019
@joeljfischer joeljfischer self-assigned this Dec 3, 2019
@NicoleYarroch NicoleYarroch self-requested a review December 3, 2019 20:16
Copy link
Contributor

@NicoleYarroch NicoleYarroch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left one comment

@joeljfischer joeljfischer added this to In progress in v6.4.1 via automation Jan 3, 2020
@joeljfischer joeljfischer moved this from In progress to Reviewer approved in v6.4.1 Jan 3, 2020
@joeljfischer joeljfischer removed this from Reviewer approved in v6.4.1 Jan 3, 2020
@joeljfischer joeljfischer added this to Reviewer approved in v6.5.0 Jan 3, 2020
@joeljfischer joeljfischer merged commit d84ccf7 into develop Jan 3, 2020
v6.5.0 automation moved this from Reviewer approved to Done Jan 3, 2020
@joeljfischer joeljfischer deleted the bugfix/issue-1478-cpp-template-configuration branch January 3, 2020 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug A defect in the library
Projects
No open projects
v6.5.0
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants