Fix compilation of examples

FlexibleSUSY · Jan 11, 2017 · e597b73 · e597b73
1 parent 0efb844
commit e597b73
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp b/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.cpp
@@ -42,7 +42,7 @@ namespace flexiblesusy {
 #define MODELCLASSNAME CMSSM<Two_scale>
 
 MSSMcbs_low_scale_constraint<Two_scale>::MSSMcbs_low_scale_constraint()
-   : Constraint<Two_scale>()
+   : Single_scale_constraint()
    , scale(0.)
    , initial_scale_guess(0.)
    , model(0)
@@ -57,7 +57,7 @@ MSSMcbs_low_scale_constraint<Two_scale>::MSSMcbs_low_scale_constraint()
 
 MSSMcbs_low_scale_constraint<Two_scale>::MSSMcbs_low_scale_constraint(
    MSSMcbs<Two_scale>* model_, const softsusy::QedQcd& qedqcd_)
-   : Constraint<Two_scale>()
+   : Single_scale_constraint()
    , model(model_)
    , qedqcd(qedqcd_)
    , new_g1(0.)

diff --git a/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp b/examples/customized-betas/MSSMcbs_two_scale_low_scale_constraint.hpp
@@ -20,7 +20,7 @@
 #define MSSMCBS_TWO_SCALE_LOW_SCALE_CONSTRAINT_H
 
 #include "MSSMcbs_low_scale_constraint.hpp"
-#include "two_scale_constraint.hpp"
+#include "single_scale_constraint.hpp"
 #include "lowe.h"
 #include <Eigen/Core>
 
@@ -32,14 +32,15 @@ class MSSMcbs;
 class Two_scale;
 
 template<>
-class MSSMcbs_low_scale_constraint<Two_scale> : public Constraint<Two_scale> {
+class MSSMcbs_low_scale_constraint<Two_scale> : public Single_scale_constraint {
 public:
    MSSMcbs_low_scale_constraint();
    MSSMcbs_low_scale_constraint(MSSMcbs<Two_scale>*, const softsusy::QedQcd&);
    virtual ~MSSMcbs_low_scale_constraint();
-   virtual void apply();
-   virtual double get_scale() const;
-   virtual void set_model(Model*);
+   virtual void apply() override;
+   virtual double get_scale() const override;
+   virtual std::string name() const override { return "MSSMcbs low-scale constraint"; }
+   virtual void set_model(Model*) override;
 
    void clear();
    double get_initial_scale_guess() const;

diff --git a/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp b/examples/tower/MSSMD5O_MSSMRHN_two_scale_matching.cpp
@@ -23,7 +23,7 @@
 #include "ew_input.hpp"
 #include "wrappers.hpp"
 
-#include "two_scale_constraint.hpp" // for cast_model
+#include "model.hpp" // for cast_model
 #include "MSSMD5O_MSSMRHN_two_scale_matching.hpp"
 #include "MSSMD5O_two_scale_model.hpp"
 #include "MSSMRHN_two_scale_model.hpp"