Import Geant4 10.2.0 source tree

2016-06-10 14:11:04 +02:00
parent c9b32a6c0a
commit d4af681f38
4886 changed files with 420149 additions and 1023309 deletions
@@ -44,6 +44,13 @@

 #include "G4UMultiUnion.hh"

+#if defined(G4GEOM_USE_USOLIDS)
+
 typedef G4UMultiUnion G4MultiUnion;

+#else
+
+typedef void G4MultiUnion;
+
+#endif
 #endif
@@ -45,6 +45,8 @@

 #include <CLHEP/Vector/Rotation.h>

+#if defined(G4GEOM_USE_USOLIDS)
+
 #include "G4USolid.hh"
 #include "UMultiUnion.hh"
 #include "G4Transform3D.hh"
@@ -116,7 +118,7 @@ inline G4Transform3D* G4UMultiUnion::GetTransformation(G4int index) const
    rot(CLHEP::HepRep3x3(tr.fRot[0], tr.fRot[1], tr.fRot[2],
                         tr.fRot[3], tr.fRot[4], tr.fRot[5],
                         tr.fRot[6], tr.fRot[7], tr.fRot[8]));
-  G4ThreeVector transl(tr.fTr.x, tr.fTr.y, tr.fTr.z);
+  G4ThreeVector transl(tr.fTr.x(), tr.fTr.y(), tr.fTr.z());

  return new G4Transform3D(rot, transl);
 }
@@ -136,4 +138,7 @@ inline void G4UMultiUnion::Voxelize()
 {
  GetShape()->Voxelize();
 }
+
+#endif  // G4GEOM_USE_USOLIDS
+
 #endif