sherpa is hosted by Hepforge, IPPP Durham
close Warning: Can't synchronize with repository "(default)" (/hepforge/svn/sherpa does not appear to be a Subversion repository.). Look in the Trac log for more information.

Ticket #259: clang.patch

File clang.patch, 9.6 KB (added by hoeth, 11 years ago)

fixing clang errors/warnings

  • METOOLS/Vertices/VVVV_LC.C

     
    8383  for (jit[0]=cca.begin();jit[0]!=cca.end();++jit[0]) {
    8484    for (jit[1]=ccb.begin();jit[1]!=ccb.end();++jit[1]) {
    8585      for (jit[2]=cce.begin();jit[2]!=cce.end();++jit[2],++i) {
    86         const CVec4Type_Vector *ca(jit[m_n[0]]->Get<CVec4Type>());
    87         const CVec4Type_Vector *cb(jit[m_n[1]]->Get<CVec4Type>());
    88         const CVec4Type_Vector *ce(jit[m_n[2]]->Get<CVec4Type>());
     86        const CVec4Type_Vector *ca(jit[m_n[0]]->template Get<CVec4Type>());
     87        const CVec4Type_Vector *cb(jit[m_n[1]]->template Get<CVec4Type>());
     88        const CVec4Type_Vector *ce(jit[m_n[2]]->template Get<CVec4Type>());
    8989        for (typename CVec4Type_Vector::const_iterator
    9090               eit(ce->begin());eit!=ce->end();++eit)
    9191          for (typename CVec4Type_Vector::const_iterator

  • METOOLS/Vertices/SSVV_LC.C

     
    110110    for (jit[1]=ccb.begin();jit[1]!=ccb.end();++jit[1]) {
    111111      for (jit[2]=cce.begin();jit[2]!=cce.end();++jit[2],++i) {
    112112  if (m_dir==0) {
    113     const CVec4Type_Vector *ca(jit[m_n[1]]->Get<CVec4Type>());
    114     const CVec4Type_Vector *cb(jit[m_n[2]]->Get<CVec4Type>());
    115     const CScalarType_Vector *ce(jit[m_n[0]]->Get<CScalarType>());
     113    const CVec4Type_Vector *ca(jit[m_n[1]]->template Get<CVec4Type>());
     114    const CVec4Type_Vector *cb(jit[m_n[2]]->template Get<CVec4Type>());
     115    const CScalarType_Vector *ce(jit[m_n[0]]->template Get<CScalarType>());
    116116    for (typename CVec4Type_Vector::const_iterator
    117117           ait(ca->begin());ait!=ca->end();++ait)
    118118      for (typename CVec4Type_Vector::const_iterator
    … …  
    134134          }
    135135  }
    136136  else {
    137     const CScalarType_Vector *ca(jit[m_n[0]]->Get<CScalarType>());
    138     const CScalarType_Vector *cb(jit[m_n[1]]->Get<CScalarType>());
    139     const CVec4Type_Vector *ce(jit[m_n[2]]->Get<CVec4Type>());
     137    const CScalarType_Vector *ca(jit[m_n[0]]->template Get<CScalarType>());
     138    const CScalarType_Vector *cb(jit[m_n[1]]->template Get<CScalarType>());
     139    const CVec4Type_Vector *ce(jit[m_n[2]]->template Get<CVec4Type>());
    140140    for (typename CScalarType_Vector::const_iterator
    141141           ait(ca->begin());ait!=ca->end();++ait)
    142142      for (typename CScalarType_Vector::const_iterator

  • METOOLS/Currents/S_C.C

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

  • METOOLS/Currents/T_C.C

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

  • METOOLS/Currents/F_C.C

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

  • METOOLS/Currents/V_C.C

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

  • PDF/Electron/PDF_Electron.C

     
    103103PDF_Base *PDFE_Getter::operator()
    104104  (const Parameter_Type &args) const
    105105{
    106   if (!args.m_bunch.Kfcode()==kf_e) return NULL;
     106  if (args.m_bunch.Kfcode()!=kf_e) return NULL;
    107107  int izetta=args.p_read->GetValue<int>("ISR_E_ORDER",1);
    108108  int order=args.p_read->GetValue<int>("ISR_E_SCHEME",2);
    109109  return new PDF_Electron(args.m_bunch,izetta,order);

  • PHASIC++/Main/Phase_Space_Handler.C

     
    837837template Weight_Info &ATOOLS::Blob_Data_Base::Get<Weight_Info>();
    838838
    839839namespace ATOOLS {
    840   std::ostream & operator<<(std::ostream & s, const PHASIC::Weight_Info & wi)
    841   {
    842     s<<" w = "<<wi.m_weight<<std::endl;
    843     return s;
    844   }
    845 }
    846 
    847 namespace ATOOLS {
    848840template <> Blob_Data<Weight_Info>::~Blob_Data() {}
    849841
    850842template class Blob_Data<Weight_Info>;

  • PHASIC++/Main/Phase_Space_Handler.H

     
    6363
    6464  };// end of struct Weight_Info
    6565
     66  inline std::ostream & operator<<(std::ostream & s, const PHASIC::Weight_Info & wi)
     67  {
     68    s<<" w = "<<wi.m_weight<<std::endl;
     69    return s;
     70  }
     71
    6672  class Phase_Space_Integrator;
    6773  class Process_Base;
    6874

  • AMEGIC++/Amplitude/Single_Amplitude.C

     
    180180        msg_Out()<<"G("<<c->ParticleArg(0)<<" "<<c->ParticleArg(1)<<") ";
    181181        break;
    182182      }
    183       case 10: {
    184         msg_Out()<<"TP("<<c->ParticleArg(0)<<" "<<c->ParticleArg(1)
    185                             <<" "<<c->ParticleArg(2)<<") ";
    186         break;
    187       }
    188183      default : break;
    189184    }
    190185    c = c->Next();     

  • AMEGIC++/Amplitude/Amplitude_Output.C

     
    1616  pid=pid.substr(pid.rfind('/')+1);
    1717  std::string fname=gpath+pid+std::string(".tex");
    1818  pios.open(fname.c_str());
    19   top = top;
     19  top = _top;
    2020  ampl=0;
    2121  counter=0;
    2222  maincounter=1;

  • HADRONS++/Main/Mixing_Handler.C

     
    6565  string tag = flav.IsAnti() ? flav.Bar().IDName() : flav.IDName();
    6666  if(m_model("Mixing_"+tag,0.0)!=0.0 && decayer->Info()!=char('M')) {
    6767    double t = DetermineMixingTime(decayer,true)/rpa->hBar();
    68     if(t==0.0) return false;
     68    if(t==0.0) return NULL;
    6969    double factor = decayer->Flav().QOverP2();
    7070    if(decayer->Flav().IsAnti()) factor = 1.0/factor;
    7171    double dG = decayer->Flav().DeltaGamma()*t/4.0;

  • SHRiMPS/Tools/DEQ_Solver.C

     
    6464      }
    6565    }
    6666  } while (run);
    67   if (accu>=0.) msg_Tracking()<<"Out "<<METHOD<<"(steps = "<<steps<<", accu = "<<accu<<"), "
    68                               <<"accuracy better than "<<diffmax<<"."<<std::endl;
    69   else msg_Debugging()<<"Out "<<METHOD<<"(steps = "<<steps<<", accu = "<<accu<<")."<<std::endl;
     67  if (accu>=0.) {
     68    msg_Tracking()<<"Out "<<METHOD<<"(steps = "<<steps<<", accu = "<<accu<<"), "
     69                  <<"accuracy better than "<<diffmax<<"."<<std::endl;
     70  } else {
     71    msg_Debugging()<<"Out "<<METHOD<<"(steps = "<<steps<<", accu = "<<accu<<")."<<std::endl;
     72  }
    7073}
    7174
    7275

  • AMISIC++/Model/Simple_Chain.C

     
    225225  return true;
    226226}
    227227
    228 bool Simple_Chain::InitializeProcessList(const Flavour& in1,
     228void Simple_Chain::InitializeProcessList(const Flavour& in1,
    229229                                         const Flavour& in2,
    230230                                         const Flavour& out1,
    231231                                         const Flavour& out2)

  • AMISIC++/Model/Simple_Chain.H

     
    7575    bool ReadInData();
    7676
    7777    bool CreateGrid();
    78     bool InitializeProcessList(const ATOOLS::Flavour& in1,
     78    void InitializeProcessList(const ATOOLS::Flavour& in1,
    7979                               const ATOOLS::Flavour& in2,
    8080                               const ATOOLS::Flavour& out1,
    8181                               const ATOOLS::Flavour& out2);