Skip to content

[eve7] Include json_fwd.hpp if available [v6.26]#11225

Merged
hahnjo merged 3 commits intoroot-project:v6-26-00-patchesfrom
hahnjo:json-fwd-v626
Aug 19, 2022
Merged

[eve7] Include json_fwd.hpp if available [v6.26]#11225
hahnjo merged 3 commits intoroot-project:v6-26-00-patchesfrom
hahnjo:json-fwd-v626

Conversation

@hahnjo
Copy link
Copy Markdown
Member

@hahnjo hahnjo commented Aug 19, 2022

Fixes #11130

Backport of #11205

hahnjo added 3 commits August 19, 2022 13:59
Version 3.11 of nlohmann/json introduced "versioned, ABI-tagged inline
namespace"s, which breaks our forward declaration. Fortunately, we can
assume the json_fwd.hpp header to be present starting from that same
version because the JSON_MultipleHeaders option now defaults to ON and
even if not, json_fwd.hpp is installed since patch version 3.11.2. For
earlier versions, both methods work but json_fwd.hpp isn't guaranteed
to be installed. Still use it if available.

Fixes root-project#11130

(cherry picked from commit ed56a35)
Our forward declaration in REveElement.hxx breaks with the versioned
namespaces in 3.11, so we require the json_fwd.hpp header.

(cherry picked from commit ee52a8b)
@hahnjo hahnjo self-assigned this Aug 19, 2022
@phsft-bot
Copy link
Copy Markdown

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 changed the title [eve7] Include json_fwd.hpp if available [eve7] Include json_fwd.hpp if available [v6.26] Aug 19, 2022
@hahnjo hahnjo merged commit 26247b6 into root-project:v6-26-00-patches Aug 19, 2022
@hahnjo hahnjo deleted the json-fwd-v626 branch August 19, 2022 14:57
@phsft-bot
Copy link
Copy Markdown

Build failed on mac1015/cxx17.
Running on macitois21.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Errors:

  • [2022-08-19T16:53:05.973Z] CMake Error at /Volumes/HD2/build/workspace/root-pullrequests-build/rootspi/jenkins/root-build.cmake:1088 (message):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants