add inline specifier for detail::combine #2285
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks! Can you please also run the amalgamation? |
|
oh, yea. Sorry, I forgot that. I hope it's fine like this. |
|
I think we should add a regression test for this - at least something basic that consists of two translation units. But this would be out of scope of this PR. |
Closed
|
Thanks! |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix compiles where multiple source files include the header and generate multiple definitions of
nlohmann::detail::combineby adding an inline specifier.I hope it's okay I skipped the unit test and stuff since I would figure this literally can't break anything.
Fixes #2281.