GCC 48 #1257
Merged
GCC 48 #1257
+91
−54
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
See nlohmann#212 for details
henryiii
force-pushed
the
gcc48
branch
2 times, most recently
from
79c58ea
to
a25ca94
Compare
|
👍 |
nlohmann
requested changes
Sep 27, 2018
|
I missed the compiler testing list in the readme, added a line there too. The other version strings may be a bit out of date. Also, I'm testing with the external GCC 4.8.5 package just like all the other GCC versions, but GCC 4.8.4 is the default compiler on Travis, so for the first time you could have a no extra packages GCC build of JSON on Travis. |
|
You’ll also want to update the text in the little graphic on the main page where there’s a 3.2.1 release. |
|
Thanks so much for the effort! |
mosra
added a commit
to mosra/magnum-plugins
that referenced
this pull request
Dec 14, 2018
This allows us to build the TinyGltfImporter on GCC 4.8. It was disabled until now on Linux because the Travis builds were using GCC 4.7 and json.hpp required 4.9, but now that we're dropping 4.7 support, it makes sense to go an extra step and have this built under 4.8 as well. Taken from nlohmann/json#1257, applied the part that touches single_include/nlohmann/json.hpp except the compiler check on top, which doesn't apply. I could also update to json.hpp 3.3 / 3.4, but that version is 700 kB (vs 480 kB for this one) and I have no reason to use that. I also hope I'll never need to update this thing again.
mosra
added a commit
to mosra/magnum-plugins
that referenced
this pull request
Dec 14, 2018
This allows us to build the TinyGltfImporter on GCC 4.8. It was disabled until now on Linux because the Travis builds were using GCC 4.7 and json.hpp required 4.9, but now that we're dropping 4.7 support, it makes sense to go an extra step and have this built under 4.8 as well. Taken from nlohmann/json#1257, applied the part that touches single_include/nlohmann/json.hpp skipping the compiler check on top (which doesn't apply) and doing the change by hand. I could also update to json.hpp 3.3 / 3.4, but that version is 700 kB (vs 480 kB for this one) and I have no reason to use that. I also hope I'll never need to update this thing again.
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.
This adds GCC 4.8 support, all tests pass on CentOS/RHEL 7. Previously discussed in #212.
All tests pass on Travis, even on GCC 4.8!