[6.40] Relocate the macro definition for XROOFIT_NAMESPACE_NAME#22684
Merged
guitargeek merged 1 commit intoJun 24, 2026
Merged
Conversation
jblomer
previously requested changes
Jun 23, 2026
jblomer
left a comment
Contributor
There was a problem hiding this comment.
Something went wrong with the backport...
Test Results 22 files 22 suites 3d 10h 11m 58s ⏱️ Results for commit f26bd48. |
In Tests running in StatAnalysis we are seeing errors related to this macro definition. The changes in this PR are to try to consolidate the definition of XROOFIT_NAMESPACE_NAME in the `Config.h` file, which hopefully will resolve the ambiguities. The problems were observed after building xRooFit on top of ROOT and then on the root prompt doing: `#include "xRooFit/xRooFit.h"` I also ran a clang format, which is the source of the whitespace changes in this PR. (cherry picked from commit 33cc89c)
f26bd48 to
4554b6d
Compare
36ad2c9
into
root-project:v6-40-00-patches
27 of 30 checks passed
This file contains hidden or 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
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.
Backport of #22679, requested by @guitargeek. For your information @will-cern