Compilation on MacOS with clang

diff --git a/EVGEN/AliGenReaderHepMC.cxx b/EVGEN/AliGenReaderHepMC.cxx
index ddc332c8a86bbe1b8abe1f3342b59a1a3b45708a..f24a055857f27227879766dd5e2479b20d5138aa 100644 (file)
--- 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 88b22c4cc2adcc952e80bf60c0c4327c96b09f0a..77e2d19382f8b4c4c75edc035c1384f3c115f6e3 100644 (file)
--- 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 2d18d72dc75b930208da95b815bee04b5972b77b..f6531e1f0a19ac264c2742f0405aa34466787962 100644 (file)
--- 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 03d73c57cd7b3a2005acb910ca8fcd7415ca6b96..1d4625800a41f6fcb66bf96ecc79a5413cb762d9 100644 (file)
--- a/TEvtGen/THepMCParser.h
+++ b/TEvtGen/THepMCParser.h
@@ -8,11 +8,15 @@
 #include <string>
 #include <list>
 #include <set>
-#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 {