Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Event.hh 94950 2016-01-07 11:53:14Z gcosmo $
|
||||
// $Id: G4Event.hh 110273 2018-05-17 14:43:43Z gcosmo $
|
||||
//
|
||||
//
|
||||
// class description:
|
||||
@@ -217,17 +217,17 @@ class G4Event
|
||||
}
|
||||
};
|
||||
|
||||
extern G4EVENT_DLL G4ThreadLocal G4Allocator<G4Event> *anEventAllocator;
|
||||
extern G4EVENT_DLL G4Allocator<G4Event>*& anEventAllocator();
|
||||
|
||||
inline void* G4Event::operator new(size_t)
|
||||
{
|
||||
if (!anEventAllocator) anEventAllocator = new G4Allocator<G4Event>;
|
||||
return (void*)anEventAllocator->MallocSingle();
|
||||
if (!anEventAllocator()) anEventAllocator() = new G4Allocator<G4Event>;
|
||||
return (void*)anEventAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4Event::operator delete(void* anEvent)
|
||||
{
|
||||
anEventAllocator->FreeSingle((G4Event*)anEvent);
|
||||
anEventAllocator()->FreeSingle((G4Event*)anEvent);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4HEPEvtParticle.hh 69010 2013-04-15 09:34:16Z gcosmo $
|
||||
// $Id: G4HEPEvtParticle.hh 110273 2018-05-17 14:43:43Z gcosmo $
|
||||
//
|
||||
//
|
||||
// class desccription:
|
||||
@@ -76,18 +76,18 @@ class G4HEPEvtParticle
|
||||
{ return JDAHEP2; }
|
||||
};
|
||||
|
||||
extern G4EVENT_DLL G4ThreadLocal G4Allocator<G4HEPEvtParticle> *aHEPEvtParticleAllocator;
|
||||
extern G4EVENT_DLL G4Allocator<G4HEPEvtParticle>*& aHEPEvtParticleAllocator();
|
||||
|
||||
inline void * G4HEPEvtParticle::operator new(size_t)
|
||||
{
|
||||
if (!aHEPEvtParticleAllocator)
|
||||
aHEPEvtParticleAllocator = new G4Allocator<G4HEPEvtParticle>;
|
||||
return (void *) aHEPEvtParticleAllocator->MallocSingle();
|
||||
if (!aHEPEvtParticleAllocator())
|
||||
aHEPEvtParticleAllocator() = new G4Allocator<G4HEPEvtParticle>;
|
||||
return (void *) aHEPEvtParticleAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4HEPEvtParticle::operator delete(void * aHEPEvtParticle)
|
||||
{
|
||||
aHEPEvtParticleAllocator->FreeSingle((G4HEPEvtParticle *) aHEPEvtParticle);
|
||||
aHEPEvtParticleAllocator()->FreeSingle((G4HEPEvtParticle *) aHEPEvtParticle);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4TrajectoryContainer.hh 69010 2013-04-15 09:34:16Z gcosmo $
|
||||
// $Id: G4TrajectoryContainer.hh 110273 2018-05-17 14:43:43Z gcosmo $
|
||||
//
|
||||
//
|
||||
// G4TrajectoryContainer
|
||||
@@ -82,18 +82,18 @@ class G4TrajectoryContainer
|
||||
TrajectoryVector* vect;
|
||||
};
|
||||
|
||||
extern G4EVENT_DLL G4ThreadLocal G4Allocator<G4TrajectoryContainer> *aTrajectoryContainerAllocator;
|
||||
extern G4EVENT_DLL G4Allocator<G4TrajectoryContainer>*& aTrajectoryContainerAllocator();
|
||||
|
||||
inline void* G4TrajectoryContainer::operator new(size_t)
|
||||
{
|
||||
if (!aTrajectoryContainerAllocator)
|
||||
aTrajectoryContainerAllocator = new G4Allocator<G4TrajectoryContainer>;
|
||||
return (void*)aTrajectoryContainerAllocator->MallocSingle();
|
||||
if (!aTrajectoryContainerAllocator())
|
||||
aTrajectoryContainerAllocator() = new G4Allocator<G4TrajectoryContainer>;
|
||||
return (void*)aTrajectoryContainerAllocator()->MallocSingle();
|
||||
}
|
||||
|
||||
inline void G4TrajectoryContainer::operator delete(void* aTrajectoryContainer)
|
||||
{
|
||||
aTrajectoryContainerAllocator->FreeSingle((G4TrajectoryContainer*)aTrajectoryContainer);
|
||||
aTrajectoryContainerAllocator()->FreeSingle((G4TrajectoryContainer*)aTrajectoryContainer);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user