Import Geant4 10.0.0 source tree

2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
@@ -26,7 +26,7 @@
 /// \file runAndEvent/RE01/include/RE01CalorimeterHit.hh
 /// \brief Definition of the RE01CalorimeterHit class
 //
-// $Id$
+// $Id: RE01CalorimeterHit.hh 75295 2013-10-30 09:32:52Z gcosmo $
 //

 #ifndef RE01CalorimeterHit_h
@@ -41,6 +41,8 @@
 #include "G4RotationMatrix.hh"
 #include "RE01TrackInformation.hh"

+#include "G4Types.hh"
+
 class G4AttDef;
 class G4AttValue;

@@ -97,18 +99,18 @@ private:

 typedef G4THitsCollection<RE01CalorimeterHit> RE01CalorimeterHitsCollection;

-extern G4Allocator<RE01CalorimeterHit> RE01CalorimeterHitAllocator;
+extern G4ThreadLocal G4Allocator<RE01CalorimeterHit> * RE01CalorimeterHitAllocator;

 inline void* RE01CalorimeterHit::operator new(size_t)
 {
-  void *aHit;
-  aHit = (void *) RE01CalorimeterHitAllocator.MallocSingle();
-  return aHit;
+  if(!RE01CalorimeterHitAllocator)
+    RE01CalorimeterHitAllocator = new G4Allocator<RE01CalorimeterHit>;
+  return (void *) RE01CalorimeterHitAllocator->MallocSingle();
 }

 inline void RE01CalorimeterHit::operator delete(void *aHit)
 {
-  RE01CalorimeterHitAllocator.FreeSingle((RE01CalorimeterHit*) aHit);
+  RE01CalorimeterHitAllocator->FreeSingle((RE01CalorimeterHit*) aHit);
 }

 #endif