Skip to content

[RF] Fix debug build with C++14 #10263

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

Merged
merged 1 commit into from
Mar 30, 2022
Merged

[RF] Fix debug build with C++14 #10263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions roofit/roofitcore/res/RooNLLVarNew.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class RooNLLVarNew : public RooAbsReal {

public:
// The names for the weight variables that the RooNLLVarNew expects
static constexpr auto weightVarName = "_weight";
static constexpr auto weightVarNameSumW2 = "_weight_sumW2";
static constexpr auto weightVarNameSumW2Suffix = "_sumW2";
static constexpr const char *weightVarName = "_weight";
static constexpr const char *weightVarNameSumW2 = "_weight_sumW2";
static constexpr const char *weightVarNameSumW2Suffix = "_sumW2";

RooNLLVarNew(){};
RooNLLVarNew(const char *name, const char *title, RooAbsPdf &pdf, RooArgSet const &observables, RooAbsReal *weight,
Expand Down
5 changes: 5 additions & 0 deletions roofit/roofitcore/src/RooNLLVarNew.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ functions from `RooBatchCompute` library to provide faster computation times.

using namespace ROOT::Experimental;

// Declare constexpr static members to make them available if odr-used in C++14.
constexpr const char *RooNLLVarNew::weightVarName;
constexpr const char *RooNLLVarNew::weightVarNameSumW2;
constexpr const char *RooNLLVarNew::weightVarNameSumW2Suffix;

namespace {

std::unique_ptr<RooAbsReal> createRangeNormTerm(RooAbsPdf const &pdf, RooArgSet const &observables,
Expand Down