Ticket #259: 143_clang.patch

METOOLS/Currents/F_C.C

@@ -129 +129 @@
   msg_Debugging()<<"pp = "<<pp<<", pm = "<<pm<<", pt = "<<pt<<"\n";
 #endif
   for (size_t i(0);i<m_j.size();++i) {
-  CSpinorType_Vector *j(m_j[i].Get<CSpinorType>());
+  CSpinorType_Vector *j(m_j[i].template Get<CSpinorType>());
   for (typename CSpinorType_Vector::iterator 
          jit(j->begin());jit!=j->end();++jit) {
     CSpinorType j((*jit)->R(),(*jit)->B(),(**jit)(0),(**jit)(1),

METOOLS/Currents/S_C.C

@@ -102 +102 @@
                  <<this->m_p.Abs2()<<", m = "<<sqrt(m_cmass2)<<"\n";
 #endif
   for (size_t i(0);i<m_j.size();++i) {
-  CScalarType_Vector *j(m_j[i].Get<CScalarType>());
+  CScalarType_Vector *j(m_j[i].template Get<CScalarType>());
   for (typename CScalarType_Vector::iterator 
          jit(j->begin());jit!=j->end();++jit) **jit*=prop;
   }

METOOLS/Currents/T_C.C

@@ -74 +74 @@
 {
   // add propagator for off-shell leg
   for (size_t i(0);i<m_j.size();++i) {
-  CAsT4Type_Vector *j(m_j[i].Get<CAsT4Type>());
+  CAsT4Type_Vector *j(m_j[i].template Get<CAsT4Type>());
   for (typename CAsT4Type_Vector::iterator 
          jit(j->begin());jit!=j->end();++jit) **jit*=m_prop;
   }

METOOLS/Currents/V_C.C

@@ -209 +209 @@
   msg_Debugging()<<"propagator: "<<prop<<"\n";
 #endif
   for (size_t i(0);i<m_j.size();++i) {
-  CVec4Type_Vector *j(m_j[i].Get<CVec4Type>());
+  CVec4Type_Vector *j(m_j[i].template Get<CVec4Type>());
   if (!this->m_fl.Strong()) {
     if (!this->m_msv)
       for (typename CVec4Type_Vector::iterator 

METOOLS/Vertices/SSVV_LC.C

@@ -110 +110 @@
     for (jit[1]=ccb.begin();jit[1]!=ccb.end();++jit[1]) {
       for (jit[2]=cce.begin();jit[2]!=cce.end();++jit[2],++i) {
   if (m_dir==0) {
-    const CVec4Type_Vector *ca(jit[m_n[1]]->Get<CVec4Type>());
-    const CVec4Type_Vector *cb(jit[m_n[2]]->Get<CVec4Type>());
-    const CScalarType_Vector *ce(jit[m_n[0]]->Get<CScalarType>());
+    const CVec4Type_Vector *ca(jit[m_n[1]]->template Get<CVec4Type>());
+    const CVec4Type_Vector *cb(jit[m_n[2]]->template Get<CVec4Type>());
+    const CScalarType_Vector *ce(jit[m_n[0]]->template Get<CScalarType>());
     for (typename CVec4Type_Vector::const_iterator 
            ait(ca->begin());ait!=ca->end();++ait)
       for (typename CVec4Type_Vector::const_iterator 
@@ -134 +134 @@
           }
   }
   else {
-    const CScalarType_Vector *ca(jit[m_n[0]]->Get<CScalarType>());
-    const CScalarType_Vector *cb(jit[m_n[1]]->Get<CScalarType>());
-    const CVec4Type_Vector *ce(jit[m_n[2]]->Get<CVec4Type>());
+    const CScalarType_Vector *ca(jit[m_n[0]]->template Get<CScalarType>());
+    const CScalarType_Vector *cb(jit[m_n[1]]->template Get<CScalarType>());
+    const CVec4Type_Vector *ce(jit[m_n[2]]->template Get<CVec4Type>());
     for (typename CScalarType_Vector::const_iterator 
            ait(ca->begin());ait!=ca->end();++ait)
       for (typename CScalarType_Vector::const_iterator 

METOOLS/Vertices/VVVV_LC.C

@@ -83 +83 @@
   for (jit[0]=cca.begin();jit[0]!=cca.end();++jit[0]) {
     for (jit[1]=ccb.begin();jit[1]!=ccb.end();++jit[1]) {
       for (jit[2]=cce.begin();jit[2]!=cce.end();++jit[2],++i) {
-        const CVec4Type_Vector *ca(jit[m_n[0]]->Get<CVec4Type>());
-        const CVec4Type_Vector *cb(jit[m_n[1]]->Get<CVec4Type>());
-        const CVec4Type_Vector *ce(jit[m_n[2]]->Get<CVec4Type>());
+        const CVec4Type_Vector *ca(jit[m_n[0]]->template Get<CVec4Type>());
+        const CVec4Type_Vector *cb(jit[m_n[1]]->template Get<CVec4Type>());
+        const CVec4Type_Vector *ce(jit[m_n[2]]->template Get<CVec4Type>());
         for (typename CVec4Type_Vector::const_iterator 
                eit(ce->begin());eit!=ce->end();++eit)
           for (typename CVec4Type_Vector::const_iterator 

PHASIC++/Main/Phase_Space_Handler.C

@@ -857 +857 @@
 template Weight_Info &ATOOLS::Blob_Data_Base::Get<Weight_Info>();
 
 namespace ATOOLS {
-  std::ostream & operator<<(std::ostream & s, const PHASIC::Weight_Info & wi)
-  {
-    s<<" w = "<<wi.m_weight<<std::endl;
-    return s;
-  }
-}
-
-namespace ATOOLS {
 template <> Blob_Data<Weight_Info>::~Blob_Data() {}
 
 template class Blob_Data<Weight_Info>;

PHASIC++/Main/Phase_Space_Handler.H

@@ -63 +63 @@
 
   };// end of struct Weight_Info
 
+  inline std::ostream & operator<<(std::ostream & s, const PHASIC::Weight_Info & wi)
+  {
+    s<<" w = "<<wi.m_weight<<std::endl;
+    return s;
+  }
+
   class Phase_Space_Integrator;
   class Process_Base;