lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.5.0.beta source tree

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
source/track/include/G4Track.icc
+5 -5
View File
@@ -24,14 +24,14 @@
// ********************************************************************
//
//
// $Id: G4Track.icc 94983 2016-01-13 11:02:33Z gcosmo $
// $Id: G4Track.icc 110263 2018-05-17 14:28:14Z gcosmo $
//
//-----------------------------------------------------------------
// Definitions of inline functions
//-----------------------------------------------------------------
// change GetMaterial 16 Feb. 2000 H.Kurashige
extern G4TRACK_DLL G4ThreadLocal G4Allocator<G4Track> *aTrackAllocator;
extern G4TRACK_DLL G4Allocator<G4Track>*& aTrackAllocator();
//-------------------------------------------------------------
// To implement bi-directional association between G4Step and
@@ -44,13 +44,13 @@ extern G4TRACK_DLL G4ThreadLocal G4Allocator<G4Track> *aTrackAllocator;
inline void* G4Track::operator new(size_t)
{
if (!aTrackAllocator) aTrackAllocator = new G4Allocator<G4Track>;
return (void *) aTrackAllocator->MallocSingle();
if (!aTrackAllocator()) aTrackAllocator() = new G4Allocator<G4Track>;
return (void *) aTrackAllocator()->MallocSingle();
}
// Override "new" for "G4Allocator".
inline void G4Track::operator delete(void *aTrack)
{ aTrackAllocator->FreeSingle((G4Track *) aTrack); }
{ aTrackAllocator()->FreeSingle((G4Track *) aTrack); }
// Override "delete" for "G4Allocator".
inline G4bool G4Track::operator==( const G4Track& trk)