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/G4NavigationHistory.icc
+6 -7
View File
@@ -24,15 +24,14 @@
// ********************************************************************
//
//
// $Id: G4NavigationHistory.icc 86527 2014-11-13 15:06:24Z gcosmo $
// $Id: G4NavigationHistory.icc 110271 2018-05-17 14:41:15Z gcosmo $
//
//
// class G4NavigationHistory Inline implementation
//
// ----------------------------------------------------------------------
extern G4GEOM_DLL G4ThreadLocal
G4Allocator<G4NavigationHistory> *aNavigHistoryAllocator;
extern G4GEOM_DLL G4Allocator<G4NavigationHistory>*& aNavigHistoryAllocator();
// There is no provision that this class is subclassed.
// If it is subclassed & new data members are added then the
@@ -41,17 +40,17 @@ G4Allocator<G4NavigationHistory> *aNavigHistoryAllocator;
inline
void* G4NavigationHistory::operator new(size_t)
{
if (!aNavigHistoryAllocator)
if (!aNavigHistoryAllocator())
{
aNavigHistoryAllocator = new G4Allocator<G4NavigationHistory>;
aNavigHistoryAllocator() = new G4Allocator<G4NavigationHistory>;
}
return (void *) aNavigHistoryAllocator->MallocSingle();
return (void *) aNavigHistoryAllocator()->MallocSingle();
}
inline
void G4NavigationHistory::operator delete(void *aHistory)
{
aNavigHistoryAllocator->FreeSingle((G4NavigationHistory *) aHistory);
aNavigHistoryAllocator()->FreeSingle((G4NavigationHistory *) aHistory);
}
inline