Import Geant4 11.1.0 source tree
This commit is contained in:
@@ -73,7 +73,7 @@ class G4BlockingList
|
||||
// Enlarges blocking List if current size < nv, in units of stride.
|
||||
// Clears the new part of the List.
|
||||
|
||||
size_t Length() const;
|
||||
std::size_t Length() const;
|
||||
// Returns the current length of the List. Note a length of 16
|
||||
// means volumes of indices between 0 & 15 inclusive may be blocked.
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
//
|
||||
// --------------------------------------------------------------------
|
||||
|
||||
inline size_t G4BlockingList::Length() const
|
||||
inline std::size_t G4BlockingList::Length() const
|
||||
{
|
||||
return fBlockingList.size();
|
||||
}
|
||||
@@ -59,10 +59,10 @@ inline void G4BlockingList::Reset()
|
||||
|
||||
inline void G4BlockingList::Enlarge(const G4int nv)
|
||||
{
|
||||
size_t len=fBlockingList.size();
|
||||
std::size_t len=fBlockingList.size();
|
||||
if ( G4int(len)<nv )
|
||||
{
|
||||
size_t newlen = (nv/fStride+1)*fStride;
|
||||
std::size_t newlen = (nv/fStride+1)*fStride;
|
||||
fBlockingList.resize(newlen);
|
||||
for (auto i=len; i<newlen; ++i)
|
||||
{
|
||||
|
||||
@@ -37,7 +37,9 @@
|
||||
#include "globals.hh"
|
||||
#include "G4ErrorSurfaceTarget.hh"
|
||||
#include "G4ThreeVector.hh"
|
||||
#include "G4Normal3D.hh"
|
||||
#include "G4Plane3D.hh"
|
||||
#include "G4Point3D.hh"
|
||||
|
||||
class G4ErrorPlaneSurfaceTarget : public G4ErrorSurfaceTarget, G4Plane3D
|
||||
{
|
||||
|
||||
@@ -209,9 +209,9 @@ class G4LogicalVolume
|
||||
void SetName(const G4String& pName);
|
||||
// Returns and sets the name of the logical volume.
|
||||
|
||||
inline size_t GetNoDaughters() const;
|
||||
inline std::size_t GetNoDaughters() const;
|
||||
// Returns the number of daughters (0 to n).
|
||||
inline G4VPhysicalVolume* GetDaughter(const G4int i) const;
|
||||
inline G4VPhysicalVolume* GetDaughter(const std::size_t i) const;
|
||||
// Returns the ith daughter. Note numbering starts from 0,
|
||||
// and no bounds checking is performed.
|
||||
void AddDaughter(G4VPhysicalVolume* p);
|
||||
|
||||
@@ -69,7 +69,7 @@ G4FieldManager* G4LogicalVolume::GetMasterFieldManager() const
|
||||
// ********************************************************************
|
||||
//
|
||||
inline
|
||||
size_t G4LogicalVolume::GetNoDaughters() const
|
||||
std::size_t G4LogicalVolume::GetNoDaughters() const
|
||||
{
|
||||
return fDaughters.size();
|
||||
}
|
||||
@@ -79,7 +79,7 @@ size_t G4LogicalVolume::GetNoDaughters() const
|
||||
// ********************************************************************
|
||||
//
|
||||
inline
|
||||
G4VPhysicalVolume* G4LogicalVolume::GetDaughter(const G4int i) const
|
||||
G4VPhysicalVolume* G4LogicalVolume::GetDaughter(const std::size_t i) const
|
||||
{
|
||||
return fDaughters[i];
|
||||
}
|
||||
|
||||
@@ -134,8 +134,8 @@ class G4Region
|
||||
GetMaterialIterator() const;
|
||||
// Return iterators to lists of root logical volumes and materials.
|
||||
|
||||
inline size_t GetNumberOfMaterials() const;
|
||||
inline size_t GetNumberOfRootVolumes() const;
|
||||
inline std::size_t GetNumberOfMaterials() const;
|
||||
inline std::size_t GetNumberOfRootVolumes() const;
|
||||
// Return the number of elements in the lists of materials and
|
||||
// root logical volumes.
|
||||
|
||||
|
||||
@@ -100,10 +100,10 @@ class G4SmartVoxelHeader
|
||||
G4double GetMinExtent() const;
|
||||
// Return the minimum coordinate limit along the current axis.
|
||||
|
||||
size_t GetNoSlices() const;
|
||||
std::size_t GetNoSlices() const;
|
||||
// Return the no of slices along the current axis.
|
||||
|
||||
G4SmartVoxelProxy* GetSlice(G4int n) const;
|
||||
G4SmartVoxelProxy* GetSlice(std::size_t n) const;
|
||||
// Return ptr to the proxy for the nth slice (numbering from 0,
|
||||
// no bounds checking performed).
|
||||
|
||||
|
||||
@@ -76,13 +76,13 @@ G4double G4SmartVoxelHeader::GetMinExtent() const
|
||||
}
|
||||
|
||||
inline
|
||||
size_t G4SmartVoxelHeader::GetNoSlices() const
|
||||
std::size_t G4SmartVoxelHeader::GetNoSlices() const
|
||||
{
|
||||
return fslices.size();
|
||||
}
|
||||
|
||||
inline
|
||||
G4SmartVoxelProxy* G4SmartVoxelHeader::GetSlice(G4int n) const
|
||||
G4SmartVoxelProxy* G4SmartVoxelHeader::GetSlice(std::size_t n) const
|
||||
{
|
||||
return fslices[n];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user