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/geometry/volumes/include/G4NavigationLevel.icc
+6 -7
View File
@@ -24,14 +24,13 @@
// ********************************************************************
//
//
// $Id: G4NavigationLevel.icc 86527 2014-11-13 15:06:24Z gcosmo $
// $Id: G4NavigationLevel.icc 110271 2018-05-17 14:41:15Z gcosmo $
//
// 30.09.97 J.Apostolakis Initial version.
//
// ----------------------------------------------------------------------
extern G4GEOM_DLL G4ThreadLocal
G4Allocator<G4NavigationLevel> *aNavigationLevelAllocator;
extern G4GEOM_DLL G4Allocator<G4NavigationLevel>*& aNavigationLevelAllocator();
inline
G4VPhysicalVolume* G4NavigationLevel::GetPhysicalVolume() const
@@ -69,11 +68,11 @@ G4int G4NavigationLevel::GetReplicaNo() const
inline
void* G4NavigationLevel::operator new(size_t)
{
if (!aNavigationLevelAllocator)
if (!aNavigationLevelAllocator())
{
aNavigationLevelAllocator = new G4Allocator<G4NavigationLevel>;
aNavigationLevelAllocator() = new G4Allocator<G4NavigationLevel>;
}
return (void *) aNavigationLevelAllocator->MallocSingle();
return (void *) aNavigationLevelAllocator()->MallocSingle();
}
// Added for use by STL (used for pre-allocation).
@@ -87,7 +86,7 @@ void* G4NavigationLevel::operator new(size_t,void *a)
inline
void G4NavigationLevel::operator delete(void *aLevel)
{
aNavigationLevelAllocator->FreeSingle((G4NavigationLevel *) aLevel);
aNavigationLevelAllocator()->FreeSingle((G4NavigationLevel *) aLevel);
}
// Added for use by STL (used for free-ing pre-allocated?).