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

Split declaration and implementation of GetSymbol #1969

Merged
merged 1 commit into from
Jan 16, 2024

Conversation

ljahn
Copy link

@ljahn ljahn commented Jan 15, 2024

When I was adding the new SimpleWeatherService to my Star Trek Watchface, the linker got confused about multiple implementations of Pinetime::Applications::Screens::Symbols::GetSymbol.
Including WeatherSymbols.h in two different files declared and implemented it two times.

This fixes that problem, by splitting the declaration and implementation of said function.

Copy link

github-actions bot commented Jan 15, 2024

Build checks have not completed. Possible reasons for this are:

  1. The checks need to be approved by a maintainer
  2. The branch has conflicts
  3. The firmware build has failed

@FintasticMan FintasticMan requested a review from a team January 15, 2024 14:16
@NeroBurner NeroBurner added this to the 1.15.0 milestone Jan 16, 2024
@ljahn ljahn force-pushed the fixWeatherSymbols branch from 5f63998 to d6ff539 Compare January 16, 2024 18:22
Copy link
Contributor

@NeroBurner NeroBurner left a comment

Choose a reason for hiding this comment

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

LGTM now, thanks!

@NeroBurner NeroBurner merged commit 034d83f into InfiniTimeOrg:main Jan 16, 2024
7 checks passed
@ljahn ljahn deleted the fixWeatherSymbols branch January 16, 2024 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants