Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
832efb09
Commit
832efb09
authored
9 years ago
by
Markus Frank
Browse files
Options
Downloads
Patches
Plain Diff
Fix ROOT 5 and gcc 5 compatibility
parent
f2bc1f21
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
DDG4/include/DDG4/Geant4ParticleHandler.h
+2
-1
2 additions, 1 deletion
DDG4/include/DDG4/Geant4ParticleHandler.h
DDG4/src/python/DDG4Python.C
+0
-1
0 additions, 1 deletion
DDG4/src/python/DDG4Python.C
with
2 additions
and
2 deletions
DDG4/include/DDG4/Geant4ParticleHandler.h
+
2
−
1
View file @
832efb09
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
DDG4/src/python/DDG4Python.C
+
0
−
1
View file @
832efb09
...
@@ -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;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment