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: G4Trajectory.hh 69003 2013-04-15 09:25:23Z gcosmo $
// $Id: G4Trajectory.hh 110262 2018-05-17 14:25:55Z gcosmo $
//
//---------------------------------------------------------------
//
@@ -136,19 +136,18 @@ public: // with description
};
extern G4TRACKING_DLL G4ThreadLocal
G4Allocator<G4Trajectory> *aTrajectoryAllocator;
extern G4TRACKING_DLL G4Allocator<G4Trajectory>*& aTrajectoryAllocator();
inline void* G4Trajectory::operator new(size_t)
{
if (!aTrajectoryAllocator)
{ aTrajectoryAllocator = new G4Allocator<G4Trajectory>; }
return (void*)aTrajectoryAllocator->MallocSingle();
if (!aTrajectoryAllocator())
{ aTrajectoryAllocator() = new G4Allocator<G4Trajectory>; }
return (void*)aTrajectoryAllocator()->MallocSingle();
}
inline void G4Trajectory::operator delete(void* aTrajectory)
{
aTrajectoryAllocator->FreeSingle((G4Trajectory*)aTrajectory);
aTrajectoryAllocator()->FreeSingle((G4Trajectory*)aTrajectory);
}
#endif