remove HR macro to fix compilation with Eigen 3.3

FlexibleSUSY · Dec 2, 2016 · efde579 · efde579
1 parent 9863c71
commit efde579
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 18 deletions.
diff --git a/models/SoftsusyFlavourMSSM/flavoursoft.cpp b/models/SoftsusyFlavourMSSM/flavoursoft.cpp
@@ -213,9 +213,8 @@ const DoubleMatrix FlavourMssmSoftsusy::displayMns() const {
 			      displayThetaB23(), d);
 }
 
-#define HR "----------------------------------------------------------"
-
 ostream & operator <<(ostream & left, const FlavourMssmSoftsusy & m) {
+  const std::string HR = "----------------------------------------------------------";
   left << m.displayMssmSoft();
   left << "Flavour violating parameters:\n";
   left << "CKM data: 12=" << m.displayTheta12() 
@@ -241,8 +240,6 @@ ostream & operator <<(ostream & left, const FlavourMssmSoftsusy & m) {
   return left;
 }
 
-#undef HR
-
 void FlavourMssmSoftsusy::modselSLHA(ostream & out, const char model []) {
   MssmSoftsusy::modselSLHA(out, model);
   out << "     6    " << 1 << "   # flavour violating MSSM\n"; 

diff --git a/models/SoftsusyMSSM/mssmUtils.cpp b/models/SoftsusyMSSM/mssmUtils.cpp
@@ -417,6 +417,7 @@ string recogLsp(int temp, int posj) {
 }
 
 ostream & operator <<(ostream &left, const MssmSoftsusy &s) {
+  const std::string HR = "----------------------------------------------------------";
   left << HR << endl;
   left << "Gravitino mass M3/2: " << s.displayGravitino() << endl;
   left << "Msusy: " << s.displayMsusy() << " MW: " << s.displayMw()

diff --git a/models/SoftsusyMSSM/physpars.cpp b/models/SoftsusyMSSM/physpars.cpp
@@ -62,8 +62,6 @@ void sPhysical::display(double *a) const {
   a[k++] = thetaA0;
 }
 
-#define HR "---------------------------------------------------------------\n"
-
 std::ostream & operator <<(std::ostream & left, const drBarPars &s) {
   left << s.displaysPhysical();
   left << "BPMZ conventions, N" << s.nBpmz << "U" << s.uBpmz << "V" 
@@ -113,8 +111,6 @@ std::istream & operator >>(std::istream & left, sPhysical &s) {
   return left;
 }
 
-#undef HR
-
 ostream & operator <<(ostream &st, const sProblem & p) {
   if (!p.test()) return st;
   st << "[ ";

diff --git a/models/SoftsusyMSSM/softpars.cpp b/models/SoftsusyMSSM/softpars.cpp
@@ -3079,8 +3079,6 @@ void SoftPars<Susy, Brevity>::standardSugra(double m0,  double m12, double a0) {
   universalTrilinears(a0);
 }
 
-#define HR "---------------------------------------------------------------\n"
-
 template<class Susy, class Brevity>
 ostream & operator <<(ostream &left, const SoftPars<Susy, Brevity> &s) {
   left << "SUSY breaking MSSM parameters at Q: " << s.displayMu() << endl;
@@ -3099,8 +3097,6 @@ ostream & operator <<(ostream &left, const SoftPars<Susy, Brevity> &s) {
   return left;
 }
 
-#undef HR
-
 template<class Susy, class Brevity>
 void SoftPars<Susy, Brevity>::inputSoftParsOnly() {
   char c[70];

diff --git a/models/SoftsusyMSSM/softsusy.cpp b/models/SoftsusyMSSM/softsusy.cpp
@@ -1105,8 +1105,6 @@ void Softsusy<SoftPars>::rewsb(int sgnMu, double mt, const DoubleVector & /* par
   }
 }
 
-#define HR "----------------------------------------------------------"
-
 
 /// Gives a summary of important properties of a SUSY object: mu, m3sq, mH0,
 /// mChi0, lightest stau, lightest mGluino, lightest stop, lightest chargino,

diff --git a/models/SoftsusyMSSM/susy.cpp b/models/SoftsusyMSSM/susy.cpp
@@ -12,8 +12,6 @@
 
 namespace softsusy {
 
-#define HR "---------------------------------------------------------------\n"
-
 const sBrevity & sBrevity::operator=(const sBrevity &s) {
   if (this == &s) return *this;
   dt = s.dt; ut = s.ut; et = s.et; 
@@ -640,8 +638,6 @@ void MssmSusy::getMasses(QedQcd & r, double vev) const {
   r.setMass(mTau, v1 * e1(3, 3));
 }
 
-#undef HR
-
 // Rotates to quark mass basis, returning the mixing matrices defined as 
 // yu_diag = vul yu vur^T  
 // yd_diag = vdl yd vdr^T