Skip to content

[6.40] Relocate the macro definition for XROOFIT_NAMESPACE_NAME#22684

Merged
guitargeek merged 1 commit into
root-project:v6-40-00-patchesfrom
root-project-bot:BP_6.40_pull_22679
Jun 24, 2026
Merged

[6.40] Relocate the macro definition for XROOFIT_NAMESPACE_NAME#22684
guitargeek merged 1 commit into
root-project:v6-40-00-patchesfrom
root-project-bot:BP_6.40_pull_22679

Conversation

@root-project-bot

Copy link
Copy Markdown

Backport of #22679, requested by @guitargeek. For your information @will-cern

@jblomer jblomer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Something went wrong with the backport...

@github-actions

Copy link
Copy Markdown

Test Results

    22 files      22 suites   3d 10h 11m 58s ⏱️
 3 862 tests  3 862 ✅ 0 💤 0 ❌
76 265 runs  76 265 ✅ 0 💤 0 ❌

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)
@guitargeek guitargeek force-pushed the BP_6.40_pull_22679 branch from f26bd48 to 4554b6d Compare June 23, 2026 19:16
@guitargeek guitargeek dismissed jblomer’s stale review June 23, 2026 20:05

Backport fixed!

@guitargeek guitargeek merged commit 36ad2c9 into root-project:v6-40-00-patches Jun 24, 2026
27 of 30 checks passed
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.

5 participants