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

Import Geant4 10.6.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2019-12-06 15:12:28 +01:00
parent b2a62ae692
commit 5baee230e9
2997 changed files with 141580 additions and 98673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/volumes/include/G4NavigationLevelRep.icc
+10 -17
View File
@@ -23,10 +23,9 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// G4NavigationLevelRep inline implementation
//
//
// 1 October 1997 J.Apostolakis Initial version.
//
// 1 October 1997, J.Apostolakis Initial version
// ----------------------------------------------------------------------
extern G4GEOM_DLL G4Allocator<G4NavigationLevelRep>*& aNavigLevelRepAllocator();
@@ -42,18 +41,14 @@ G4NavigationLevelRep::G4NavigationLevelRep( G4VPhysicalVolume* pPhysVol,
: sTransform(afTransform),
sPhysicalVolumePtr(pPhysVol),
sReplicaNo(repNo),
sVolumeType(volTp),
fCountRef(1)
sVolumeType(volTp)
{
}
inline
G4NavigationLevelRep::G4NavigationLevelRep()
: sTransform(),
sPhysicalVolumePtr(0),
sReplicaNo(-1),
sVolumeType(kReplica),
fCountRef(1)
sVolumeType(kReplica)
{
}
@@ -65,8 +60,7 @@ G4NavigationLevelRep::G4NavigationLevelRep( G4VPhysicalVolume* pPhysVol,
G4int repNo )
: sPhysicalVolumePtr(pPhysVol),
sReplicaNo(repNo),
sVolumeType(volTp),
fCountRef(1)
sVolumeType(volTp)
{
sTransform.InverseProduct( levelAbove, relativeCurrent );
}
@@ -76,8 +70,7 @@ G4NavigationLevelRep::G4NavigationLevelRep( G4NavigationLevelRep& right )
: sTransform(right.sTransform),
sPhysicalVolumePtr(right.sPhysicalVolumePtr),
sReplicaNo(right.sReplicaNo),
sVolumeType(right.sVolumeType),
fCountRef(1)
sVolumeType(right.sVolumeType)
{
}
@@ -102,11 +95,11 @@ G4NavigationLevelRep::~G4NavigationLevelRep()
inline
G4NavigationLevelRep&
G4NavigationLevelRep::operator=( const G4NavigationLevelRep &right )
G4NavigationLevelRep::operator=( const G4NavigationLevelRep& right )
{
if ( &right != this )
{
sTransform = right.sTransform;
sTransform = right.sTransform;
sPhysicalVolumePtr = right.sPhysicalVolumePtr;
sVolumeType = right.sVolumeType;
sReplicaNo = right.sReplicaNo;
@@ -170,7 +163,7 @@ G4bool G4NavigationLevelRep::RemoveAReference()
inline
void* G4NavigationLevelRep::operator new(size_t)
{
if (!aNavigLevelRepAllocator())
if (aNavigLevelRepAllocator() == nullptr)
{
aNavigLevelRepAllocator() = new G4Allocator<G4NavigationLevelRep>;
}
@@ -178,7 +171,7 @@ void* G4NavigationLevelRep::operator new(size_t)
}
inline
void G4NavigationLevelRep::operator delete(void *aLevelRep)
void G4NavigationLevelRep::operator delete(void* aLevelRep)
{
aNavigLevelRepAllocator()->FreeSingle((G4NavigationLevelRep *) aLevelRep);
}