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.

Sign up for GitHub

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

Jump to bottom

Update nlohmann/json.hpp to version 3.10.5 #11223

Merged
merged 2 commits into from
Aug 29, 2022
Merged

Update nlohmann/json.hpp to version 3.10.5 #11223

merged 2 commits into from
Aug 29, 2022

Conversation

linev
Copy link
Member

@linev linev commented Aug 19, 2022 •
edited
Loading

Provide json_fwd.h which can be used now in eve7

Also update forward declaration in REveElement.hxx

@linev linev requested a review from hahnjo August 19, 2022 11:48
@linev linev self-assigned this Aug 19, 2022
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

hahnjo
hahnjo approved these changes Aug 19, 2022
View reviewed changes
Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks @linev !

linev added 2 commits August 19, 2022 14:07
@linev
Update nlohmann/json.hpp to version 3.10.5
b58cc21 
Provide json_fwd.h which can be used now in eve7
@linev
[eve7] use nlohmann/json forward declaration from 3.10.5
a7cf799 
After upgrading of nlohmann this part also should be upgraded
@linev linev requested a review from osschar as a code owner August 19, 2022 12:16
@phsft-bot
Copy link
Collaborator

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

hahnjo
hahnjo reviewed Aug 19, 2022
View reviewed changes
Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

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

we can update our forward declaration, but it's really just a different form of writing it...

graf3d/eve7/inc/ROOT/REveElement.hxx Show resolved Hide resolved
graf3d/eve7/inc/ROOT/REveElement.hxx Show resolved Hide resolved
@hahnjo hahnjo mentioned this pull request Aug 23, 2022
Closed
@hahnjo
Copy link
Member

hahnjo commented Aug 23, 2022

As described in #11236, the current state in master causes problems if there is a system installation of json_fwd.hpp that is incompatible with the builtin. Can we get this merged to solve the problem? For the same reason, we probably also want a backport to v6.26...

@linev linev merged commit 09eff96 into root-project:master Aug 29, 2022
@linev linev deleted the json_3105_fwd branch August 29, 2022 07:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hahnjo hahnjo hahnjo approved these changes

@bellenot bellenot bellenot approved these changes

@Axel-Naumann Axel-Naumann Awaiting requested review from Axel-Naumann

@osschar osschar Awaiting requested review from osschar osschar is a code owner

Assignees

@linev linev

Labels
affects:master in:Build System
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@linev @phsft-bot @hahnjo @bellenot