From 832efb091798e16cd076e219e72a034d2f6c3c61 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Fri, 27 Nov 2015 10:58:17 +0000
Subject: [PATCH] Fix ROOT 5 and gcc 5 compatibility
---
DDG4/include/DDG4/Geant4ParticleHandler.h | 3 ++-
DDG4/src/python/DDG4Python.C | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/DDG4/include/DDG4/Geant4ParticleHandler.h b/DDG4/include/DDG4/Geant4ParticleHandler.h
index e18be8ef9..31ee72d9f 100644
--- a/DDG4/include/DDG4/Geant4ParticleHandler.h
+++ b/DDG4/include/DDG4/Geant4ParticleHandler.h
@@ -65,7 +65,8 @@ namespace DD4hep {
typedef Geant4ParticleMap::Particle Particle;
typedef Geant4ParticleMap::ParticleMap ParticleMap;
typedef Geant4ParticleMap::TrackEquivalents TrackEquivalents;
-#ifdef __MAKECINT__
+#if defined(__CINT__) || defined(__MAKECINT__) || defined(G__DICTIONARY)
+ // Need to force to public for the ROOT dictionary
public:
#else
private:
diff --git a/DDG4/src/python/DDG4Python.C b/DDG4/src/python/DDG4Python.C
index 6e9c95087..cecececc4 100644
--- a/DDG4/src/python/DDG4Python.C
+++ b/DDG4/src/python/DDG4Python.C
@@ -23,7 +23,6 @@
#include "DDG4Python/Geant4PythonDetectorConstruction.h"
#include "PyDDG4.h"
-
// CINT configuration
#if defined(__MAKECINT__)
#pragma link C++ namespace DD4hep;
--
GitLab