Skip to content
Snippets Groups Projects
Commit 832efb09 authored by Markus Frank's avatar Markus Frank
Browse files

Fix ROOT 5 and gcc 5 compatibility

parent f2bc1f21
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,8 @@ namespace DD4hep { ...@@ -65,7 +65,8 @@ namespace DD4hep {
typedef Geant4ParticleMap::Particle Particle; typedef Geant4ParticleMap::Particle Particle;
typedef Geant4ParticleMap::ParticleMap ParticleMap; typedef Geant4ParticleMap::ParticleMap ParticleMap;
typedef Geant4ParticleMap::TrackEquivalents TrackEquivalents; typedef Geant4ParticleMap::TrackEquivalents TrackEquivalents;
#ifdef __MAKECINT__ #if defined(__CINT__) || defined(__MAKECINT__) || defined(G__DICTIONARY)
// Need to force to public for the ROOT dictionary
public: public:
#else #else
private: private:
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "DDG4Python/Geant4PythonDetectorConstruction.h" #include "DDG4Python/Geant4PythonDetectorConstruction.h"
#include "PyDDG4.h" #include "PyDDG4.h"
// CINT configuration // CINT configuration
#if defined(__MAKECINT__) #if defined(__MAKECINT__)
#pragma link C++ namespace DD4hep; #pragma link C++ namespace DD4hep;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment