Import Geant4 10.5.0.beta source tree

This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
+6 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RichTrajectory.hh 90219 2015-05-21 08:07:27Z gcosmo $
// $Id: G4RichTrajectory.hh 110262 2018-05-17 14:25:55Z gcosmo $
//
//---------------------------------------------------------------
//
@@ -110,19 +110,18 @@ private:
};
extern G4TRACKING_DLL G4ThreadLocal
G4Allocator<G4RichTrajectory> *aRichTrajectoryAllocator;
extern G4TRACKING_DLL G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator();
inline void* G4RichTrajectory::operator new(size_t)
{
if (!aRichTrajectoryAllocator)
{ aRichTrajectoryAllocator = new G4Allocator<G4RichTrajectory>; }
return (void*)aRichTrajectoryAllocator->MallocSingle();
if (!aRichTrajectoryAllocator())
{ aRichTrajectoryAllocator() = new G4Allocator<G4RichTrajectory>; }
return (void*)aRichTrajectoryAllocator()->MallocSingle();
}
inline void G4RichTrajectory::operator delete(void* aRichTrajectory)
{
aRichTrajectoryAllocator->FreeSingle((G4RichTrajectory*)aRichTrajectory);
aRichTrajectoryAllocator()->FreeSingle((G4RichTrajectory*)aRichTrajectory);
}
#endif