Skip to content

[RF] Avoid using forward-declared class as default template arguments #8997

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
guitargeek merged 1 commit into from
Sep 15, 2021
Merged

[RF] Avoid using forward-declared class as default template arguments #8997

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
12 changes: 6 additions & 6 deletions roofit/roofitcore/inc/RooMinimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class RooPlot ;
namespace RooFit {
namespace TestStatistics {
class LikelihoodSerial;
class LikelihoodGradientSerial;
//class LikelihoodGradientSerial;
}
} // namespace RooFit

Expand All @@ -58,8 +58,8 @@ class RooMinimizer : public TObject {

explicit RooMinimizer(RooAbsReal &function, FcnMode fcnMode = FcnMode::classic);
static std::unique_ptr<RooMinimizer> create(RooAbsReal &function, FcnMode fcnMode = FcnMode::classic);
template <typename LikelihoodWrapperT = RooFit::TestStatistics::LikelihoodSerial,
typename LikelihoodGradientWrapperT = RooFit::TestStatistics::LikelihoodGradientSerial>
template <typename LikelihoodWrapperT /*= RooFit::TestStatistics::LikelihoodSerial*/,
typename LikelihoodGradientWrapperT /*= RooFit::TestStatistics::LikelihoodGradientSerial*/>
static std::unique_ptr<RooMinimizer> create(std::shared_ptr<RooFit::TestStatistics::RooAbsL> likelihood);

~RooMinimizer() override;
Expand Down Expand Up @@ -136,10 +136,10 @@ class RooMinimizer : public TObject {
bool fitFcn() const;

private:
template <typename LikelihoodWrapperT = RooFit::TestStatistics::LikelihoodSerial, typename LikelihoodGradientWrapperT = RooFit::TestStatistics::LikelihoodGradientSerial>
template <typename LikelihoodWrapperT /*= RooFit::TestStatistics::LikelihoodSerial*/, typename LikelihoodGradientWrapperT /*= RooFit::TestStatistics::LikelihoodGradientSerial*/>
RooMinimizer(std::shared_ptr<RooFit::TestStatistics::RooAbsL> likelihood,
LikelihoodWrapperT* /* used only for template deduction */ = static_cast<RooFit::TestStatistics::LikelihoodSerial*>(nullptr),
LikelihoodGradientWrapperT* /* used only for template deduction */ = static_cast<RooFit::TestStatistics::LikelihoodGradientSerial*>(nullptr));
LikelihoodWrapperT* /* used only for template deduction = static_cast<RooFit::TestStatistics::LikelihoodSerial*>(nullptr) */,
LikelihoodGradientWrapperT* /* used only for template deduction = static_cast<RooFit::TestStatistics::LikelihoodGradientSerial*>(nullptr) */);

Int_t _printLevel = 1;
Int_t _status = -99;
Expand Down
6 changes: 3 additions & 3 deletions roofit/roofitcore/inc/TestStatistics/MinuitFcnGrad.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace TestStatistics {

// forward declaration
class LikelihoodSerial;
class LikelihoodGradientSerial;
//class LikelihoodGradientSerial;

/// For communication with wrappers, an instance of this struct must be shared between them and MinuitFcnGrad. It keeps
/// track of what has been evaluated for the current parameter set provided by Minuit.
Expand All @@ -56,8 +56,8 @@ struct WrapperCalculationCleanFlags {
class MinuitFcnGrad : public ROOT::Math::IMultiGradFunction, public RooAbsMinimizerFcn {
public:
// factory
template <typename LikelihoodWrapperT = RooFit::TestStatistics::LikelihoodSerial,
typename LikelihoodGradientWrapperT = RooFit::TestStatistics::LikelihoodGradientSerial>
template <typename LikelihoodWrapperT /*= RooFit::TestStatistics::LikelihoodSerial*/,
typename LikelihoodGradientWrapperT /*= RooFit::TestStatistics::LikelihoodGradientSerial*/>
static MinuitFcnGrad *
create(const std::shared_ptr<RooFit::TestStatistics::RooAbsL> &likelihood, RooMinimizer *context,
std::vector<ROOT::Fit::ParameterSettings> &parameters, bool verbose = false);
Expand Down