Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectory.hh 90219 2015-05-21 08:07:27Z gcosmo $
|
||||
// $Id: G4RichTrajectory.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -110,19 +110,18 @@ private:
|
||||
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4RichTrajectory> *aRichTrajectoryAllocator;
|
||||
extern G4TRACKING_DLL G4Allocator<G4RichTrajectory>*& aRichTrajectoryAllocator();
|
||||
|
||||
inline void* G4RichTrajectory::operator new(size_t)
|
||||
{
|
||||
if (!aRichTrajectoryAllocator)
|
||||
{ aRichTrajectoryAllocator = new G4Allocator<G4RichTrajectory>; }
|
||||
return (void*)aRichTrajectoryAllocator->MallocSingle();
|
||||
if (!aRichTrajectoryAllocator())
|
||||
{ aRichTrajectoryAllocator() = new G4Allocator<G4RichTrajectory>; }
|
||||
return (void*)aRichTrajectoryAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4RichTrajectory::operator delete(void* aRichTrajectory)
|
||||
{
|
||||
aRichTrajectoryAllocator->FreeSingle((G4RichTrajectory*)aRichTrajectory);
|
||||
aRichTrajectoryAllocator()->FreeSingle((G4RichTrajectory*)aRichTrajectory);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RichTrajectoryPoint.hh 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4RichTrajectoryPoint.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -117,19 +117,18 @@ private:
|
||||
G4double fPostStepPointWeight;
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4RichTrajectoryPoint> *aRichTrajectoryPointAllocator;
|
||||
extern G4TRACKING_DLL G4Allocator<G4RichTrajectoryPoint>*& aRichTrajectoryPointAllocator();
|
||||
|
||||
inline void* G4RichTrajectoryPoint::operator new(size_t)
|
||||
{
|
||||
if (!aRichTrajectoryPointAllocator)
|
||||
{ aRichTrajectoryPointAllocator = new G4Allocator<G4RichTrajectoryPoint>; }
|
||||
return (void *) aRichTrajectoryPointAllocator->MallocSingle();
|
||||
if (!aRichTrajectoryPointAllocator())
|
||||
{ aRichTrajectoryPointAllocator() = new G4Allocator<G4RichTrajectoryPoint>; }
|
||||
return (void *) aRichTrajectoryPointAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4RichTrajectoryPoint::operator delete(void *aRichTrajectoryPoint)
|
||||
{
|
||||
aRichTrajectoryPointAllocator->FreeSingle
|
||||
aRichTrajectoryPointAllocator()->FreeSingle
|
||||
((G4RichTrajectoryPoint *) aRichTrajectoryPoint);
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectory.hh 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4SmoothTrajectory.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -135,19 +135,18 @@ public:
|
||||
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4SmoothTrajectory> *aSmoothTrajectoryAllocator;
|
||||
extern G4TRACKING_DLL G4Allocator<G4SmoothTrajectory>*& aSmoothTrajectoryAllocator();
|
||||
|
||||
inline void* G4SmoothTrajectory::operator new(size_t)
|
||||
{
|
||||
if (!aSmoothTrajectoryAllocator)
|
||||
{ aSmoothTrajectoryAllocator = new G4Allocator<G4SmoothTrajectory>; }
|
||||
return (void*)aSmoothTrajectoryAllocator->MallocSingle();
|
||||
if (!aSmoothTrajectoryAllocator())
|
||||
{ aSmoothTrajectoryAllocator() = new G4Allocator<G4SmoothTrajectory>; }
|
||||
return (void*)aSmoothTrajectoryAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4SmoothTrajectory::operator delete(void* aTrajectory)
|
||||
{
|
||||
aSmoothTrajectoryAllocator->FreeSingle((G4SmoothTrajectory*)aTrajectory);
|
||||
aSmoothTrajectoryAllocator()->FreeSingle((G4SmoothTrajectory*)aTrajectory);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4SmoothTrajectoryPoint.hh 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4SmoothTrajectoryPoint.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -92,19 +92,18 @@ public:
|
||||
std::vector<G4ThreeVector>* fAuxiliaryPointVector;
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4SmoothTrajectoryPoint> *aSmoothTrajectoryPointAllocator;
|
||||
extern G4TRACKING_DLL G4Allocator<G4SmoothTrajectoryPoint>*& aSmoothTrajectoryPointAllocator();
|
||||
|
||||
inline void* G4SmoothTrajectoryPoint::operator new(size_t)
|
||||
{
|
||||
if (!aSmoothTrajectoryPointAllocator)
|
||||
{ aSmoothTrajectoryPointAllocator= new G4Allocator<G4SmoothTrajectoryPoint>; }
|
||||
return (void *) aSmoothTrajectoryPointAllocator->MallocSingle();
|
||||
if (!aSmoothTrajectoryPointAllocator())
|
||||
{ aSmoothTrajectoryPointAllocator()= new G4Allocator<G4SmoothTrajectoryPoint>; }
|
||||
return (void *) aSmoothTrajectoryPointAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4SmoothTrajectoryPoint::operator delete(void *aTrajectoryPoint)
|
||||
{
|
||||
aSmoothTrajectoryPointAllocator->FreeSingle((G4SmoothTrajectoryPoint *) aTrajectoryPoint);
|
||||
aSmoothTrajectoryPointAllocator()->FreeSingle((G4SmoothTrajectoryPoint *) aTrajectoryPoint);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Trajectory.hh 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4Trajectory.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -136,19 +136,18 @@ public: // with description
|
||||
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4Trajectory> *aTrajectoryAllocator;
|
||||
extern G4TRACKING_DLL G4Allocator<G4Trajectory>*& aTrajectoryAllocator();
|
||||
|
||||
inline void* G4Trajectory::operator new(size_t)
|
||||
{
|
||||
if (!aTrajectoryAllocator)
|
||||
{ aTrajectoryAllocator = new G4Allocator<G4Trajectory>; }
|
||||
return (void*)aTrajectoryAllocator->MallocSingle();
|
||||
if (!aTrajectoryAllocator())
|
||||
{ aTrajectoryAllocator() = new G4Allocator<G4Trajectory>; }
|
||||
return (void*)aTrajectoryAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4Trajectory::operator delete(void* aTrajectory)
|
||||
{
|
||||
aTrajectoryAllocator->FreeSingle((G4Trajectory*)aTrajectory);
|
||||
aTrajectoryAllocator()->FreeSingle((G4Trajectory*)aTrajectory);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrajectoryPoint.hh 69003 2013-04-15 09:25:23Z gcosmo $
|
||||
// $Id: G4TrajectoryPoint.hh 110262 2018-05-17 14:25:55Z gcosmo $
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
//
|
||||
@@ -94,19 +94,19 @@ public: // without description
|
||||
|
||||
};
|
||||
|
||||
extern G4TRACKING_DLL G4ThreadLocal
|
||||
G4Allocator<G4TrajectoryPoint> *aTrajectoryPointAllocator;
|
||||
extern G4TRACKING_DLL
|
||||
G4Allocator<G4TrajectoryPoint>*& aTrajectoryPointAllocator();
|
||||
|
||||
inline void* G4TrajectoryPoint::operator new(size_t)
|
||||
{
|
||||
if (!aTrajectoryPointAllocator)
|
||||
{ aTrajectoryPointAllocator = new G4Allocator<G4TrajectoryPoint>; }
|
||||
return (void *) aTrajectoryPointAllocator->MallocSingle();
|
||||
if (!aTrajectoryPointAllocator())
|
||||
{ aTrajectoryPointAllocator() = new G4Allocator<G4TrajectoryPoint>; }
|
||||
return (void *) aTrajectoryPointAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4TrajectoryPoint::operator delete(void *aTrajectoryPoint)
|
||||
{
|
||||
aTrajectoryPointAllocator->FreeSingle((G4TrajectoryPoint *) aTrajectoryPoint);
|
||||
aTrajectoryPointAllocator()->FreeSingle((G4TrajectoryPoint *) aTrajectoryPoint);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user