From: hristov Date: Fri, 8 Aug 2014 16:16:58 +0000 (+0200) Subject: Compilation on MacOS with clang X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=71c3b2befcc54ed80e3f449083739c15cc70e2ba Compilation on MacOS with clang --- diff --git a/EVGEN/AliGenReaderHepMC.cxx b/EVGEN/AliGenReaderHepMC.cxx index ddc332c8a86..f24a055857f 100644 --- a/EVGEN/AliGenReaderHepMC.cxx +++ b/EVGEN/AliGenReaderHepMC.cxx @@ -7,9 +7,17 @@ #include "AliStack.h" #include "AliGenHepMCEventHeader.h" +#include "HepMC/IO_BaseClass.h" +#include "HepMC/GenEvent.h" +#include "HepMC/IO_GenEvent.h" ClassImp(AliGenReaderHepMC) +AliGenReaderHepMC::AliGenReaderHepMC():fEventsHandle(0), fGenEvent(0), fParticleArray(0), fParticleIterator(0), fGenEventHeader(0) {;} + +AliGenReaderHepMC::AliGenReaderHepMC(const AliGenReaderHepMC &reader) + :AliGenReader(reader), fEventsHandle(0), fGenEvent(0), fParticleArray(0), fParticleIterator(0), fGenEventHeader(0) {reader.Copy(*this);} + AliGenReaderHepMC& AliGenReaderHepMC::operator=(const AliGenReaderHepMC& rhs) { @@ -18,6 +26,8 @@ AliGenReaderHepMC& AliGenReaderHepMC::operator=(const AliGenReaderHepMC& rhs) return *this; } +AliGenReaderHepMC::~AliGenReaderHepMC(){ delete fEventsHandle; delete fGenEvent; delete fParticleArray; delete fParticleIterator;} // not deleting fGenEventHeader as it is returned out + void AliGenReaderHepMC::Copy(TObject&) const { // diff --git a/EVGEN/AliGenReaderHepMC.h b/EVGEN/AliGenReaderHepMC.h index 88b22c4cc2a..77e2d19382f 100644 --- a/EVGEN/AliGenReaderHepMC.h +++ b/EVGEN/AliGenReaderHepMC.h @@ -12,18 +12,20 @@ #include "AliGenReader.h" #include "AliGenEventHeader.h" #include "THepMCParser.h" -#include "HepMC/IO_BaseClass.h" -#include "HepMC/GenEvent.h" + +namespace HepMC { + class IO_BaseClass; + class GenEvent; +} class TParticle; class AliGenReaderHepMC : public AliGenReader { public: - inline AliGenReaderHepMC():fEventsHandle(0), fGenEvent(0), fParticleArray(0), fParticleIterator(0), fGenEventHeader(0) {;} - AliGenReaderHepMC(const AliGenReaderHepMC &reader) - :AliGenReader(reader), fEventsHandle(0), fGenEvent(0), fParticleArray(0), fParticleIterator(0), fGenEventHeader(0) {reader.Copy(*this);} - inline virtual ~AliGenReaderHepMC(){ delete fEventsHandle; delete fGenEvent; delete fParticleArray; delete fParticleIterator;} // not deleting fGenEventHeader as it is returned out + AliGenReaderHepMC(); + AliGenReaderHepMC(const AliGenReaderHepMC &reader); + virtual ~AliGenReaderHepMC(); AliGenEventHeader * GetGenEventHeader() const {return fGenEventHeader;}; virtual void Init(); virtual Int_t NextEvent(); diff --git a/TEvtGen/THepMCParser.cxx b/TEvtGen/THepMCParser.cxx index 2d18d72dc75..f6531e1f0a1 100644 --- a/TEvtGen/THepMCParser.cxx +++ b/TEvtGen/THepMCParser.cxx @@ -16,6 +16,7 @@ #include "TFile.h" #include "TParticle.h" #include "TDatabasePDG.h" +#include "HepMC/IO_GenEvent.h" using namespace std; diff --git a/TEvtGen/THepMCParser.h b/TEvtGen/THepMCParser.h index 03d73c57cd7..1d4625800a4 100644 --- a/TEvtGen/THepMCParser.h +++ b/TEvtGen/THepMCParser.h @@ -8,11 +8,15 @@ #include #include #include -#include "HepMC/IO_GenEvent.h" #include "TTree.h" #include "TClonesArray.h" #include "TParticle.h" +namespace HepMC { + class IO_BaseClass; + class GenVertex; + class GenEvent; +} class THepMCParser {