Merge branch 'master' into master

AIDASoft · Oct 11, 2023 · c6eb3ee · c6eb3ee
2 parents 2ce75be + 0c22264
commit c6eb3ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/DDG4/include/DDG4/Geant4SensDetAction.h b/DDG4/include/DDG4/Geant4SensDetAction.h
@@ -20,6 +20,7 @@
 
 // Geant4 include files
 #include <G4ThreeVector.hh>
+#include <G4VTouchable.hh>
 
 // C/C++ include files
 #include <vector>
@@ -28,7 +29,6 @@
 class G4HCofThisEvent;
 class G4Step;
 class G4Event;
-class G4VTouchable;
 class G4TouchableHistory;
 class G4VHitsCollection;
 class G4VReadOutGeometry;

diff --git a/DDG4/include/DDG4/Geant4TouchableHandler.h b/DDG4/include/DDG4/Geant4TouchableHandler.h
@@ -13,13 +13,14 @@
 #ifndef DDG4_GEANT4TOUCHABLEHANDLER_H
 #define DDG4_GEANT4TOUCHABLEHANDLER_H
 
+#include <G4VTouchable.hh>
+
 // C/C++ include files
 #include <vector>
 #include <string>
 
 // Forward declarations
 class G4VPhysicalVolume;
-class G4VTouchable;
 class G4Step;
 
 /// Namespace for the AIDA detector description toolkit

diff --git a/DDG4/include/DDG4/Geant4VolumeManager.h b/DDG4/include/DDG4/Geant4VolumeManager.h
@@ -18,8 +18,8 @@
 #include <DD4hep/IDDescriptor.h>
 #include <DDG4/Geant4Primitives.h>
 
+#include <G4VTouchable.hh>
 // Geant4 forward declarations
-class G4VTouchable;
 class G4VPhysicalVolume;