Skip to content

Defer Material::Predefined construction to avoid static initialization#290

Merged
mjcarroll merged 2 commits intogazebosim:mainfrom
jwnimmer-tri:fiasco-materials
Dec 2, 2021
Merged

Defer Material::Predefined construction to avoid static initialization#290
mjcarroll merged 2 commits intogazebosim:mainfrom
jwnimmer-tri:fiasco-materials

Conversation

@jwnimmer-tri
Copy link
Copy Markdown
Contributor

@jwnimmer-tri jwnimmer-tri commented Nov 24, 2021

🦟 Bug fix

Mitigates a portion of #269.
Similar to #289.

Summary

Defer Material::Predefined construction to avoid static initialization.
Switch the storage for the pre-defined list to be constexpr.
Also fix include guard spellings.

Checklist

  • Signed all commits for DCO
  • Added tests (N/A)
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

Switch the storage for the pre-defined list to be constexpr.

Also fix include guard spellings.

Signed-off-by: Jeremy Nimmer <jeremy.nimmer@tri.global>
@chapulina chapulina added the bug Something isn't working label Nov 24, 2021
@mjcarroll mjcarroll merged commit a3f59b4 into gazebosim:main Dec 2, 2021
@jwnimmer-tri jwnimmer-tri deleted the fiasco-materials branch December 2, 2021 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants