From efea10825d40688e06fbc70010901ca89b63abe9 Mon Sep 17 00:00:00 2001 From: inugent Date: Thu, 29 Aug 2013 14:45:00 +0200 Subject: [PATCH] patch for std namspace bug --- .../src/read_particles_from_HepMC.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GeneratorInterface/ExternalDecays/src/read_particles_from_HepMC.cc b/GeneratorInterface/ExternalDecays/src/read_particles_from_HepMC.cc index 5d68ec2b6724f..e075b8b9ccbd4 100644 --- a/GeneratorInterface/ExternalDecays/src/read_particles_from_HepMC.cc +++ b/GeneratorInterface/ExternalDecays/src/read_particles_from_HepMC.cc @@ -5,9 +5,9 @@ Recursively searches for final-state daughters of 'x' *******************************************************************************/ -inline vector *getDaughters(HepMC::GenParticle *x) +inline std::vector *getDaughters(HepMC::GenParticle *x) { - vector *daughters = new vector(); + std::vector *daughters = new std::vector(); if(!x->end_vertex()) return daughters; // Check decay products of 'x' @@ -20,7 +20,7 @@ inline vector *getDaughters(HepMC::GenParticle *x) // all of its daughters. if( pp->end_vertex() && pp->pdg_id()!=111) { - vector *sub_daughters = getDaughters(pp); + std::vector *sub_daughters = getDaughters(pp); daughters->insert(daughters->end(),sub_daughters->begin(),sub_daughters->end()); delete sub_daughters; @@ -84,7 +84,7 @@ inline bool isFirst(HepMC::GenParticle *x){ Event will continue to be processed with next function call. *******************************************************************************/ -int readParticlesFromHepMC(const HepMC::GenEvent *event, SimpleParticle &X, SimpleParticle &tau, SimpleParticle &tau2, vector &tau_daughters, vector &tau2_daughters) +int readParticlesFromHepMC(const HepMC::GenEvent *event, SimpleParticle &X, SimpleParticle &tau, SimpleParticle &tau2, std::vector &tau_daughters, std::vector &tau2_daughters) { if(event==NULL) return 1; @@ -118,7 +118,7 @@ int readParticlesFromHepMC(const HepMC::GenEvent *event, SimpleParticle &X, Simp else if(!hTau2) hTau2 = *it2; else { - cout<<"TauSpiner: three taus in one decay"<pdg_id()); // Create list of tau daughters - vector *buf = getDaughters(hTau); + std::vector *buf = getDaughters(hTau); tau_daughters.clear(); tau_daughters.insert(tau_daughters.end(),buf->begin(),buf->end());