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/processes/electromagnetic/dna/molecules/management/include/G4Molecule.hh
+5 -5
View File
@@ -299,24 +299,24 @@ private:
};
#if defined G4EM_ALLOC_EXPORT
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4Molecule> *aMoleculeAllocator;
extern G4DLLEXPORT G4Allocator<G4Molecule>*& aMoleculeAllocator();
#else
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4Molecule> *aMoleculeAllocator;
extern G4DLLIMPORT G4Allocator<G4Molecule>*& aMoleculeAllocator();
#endif
//////////////////////////
inline void * G4Molecule::operator new(size_t)
//////////////////////////
{
if (!aMoleculeAllocator) aMoleculeAllocator = new G4Allocator<G4Molecule>;
return (void *) aMoleculeAllocator->MallocSingle();
if (!aMoleculeAllocator()) aMoleculeAllocator() = new G4Allocator<G4Molecule>;
return (void *) aMoleculeAllocator()->MallocSingle();
}
//////////////////////////
inline void G4Molecule::operator delete(void * aMolecule)
//////////////////////////
{
aMoleculeAllocator->FreeSingle((G4Molecule *) aMolecule);
aMoleculeAllocator()->FreeSingle((G4Molecule *) aMolecule);
}
#endif
source/processes/electromagnetic/dna/molecules/management/src/G4Molecule.cc
+6 -2
View File
@@ -22,7 +22,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Molecule.cc 103042 2017-03-10 11:50:07Z gcosmo $
// $Id: G4Molecule.cc 110873 2018-06-22 13:11:22Z gcosmo $
//
// ---------------------------------------------------------------------
// GEANT 4 class header file
@@ -62,7 +62,11 @@ using namespace std;
ITImp(G4Molecule)
G4ThreadLocal G4Allocator<G4Molecule> *aMoleculeAllocator = 0;
G4Allocator<G4Molecule>*& aMoleculeAllocator()
{
G4ThreadLocalStatic G4Allocator<G4Molecule>* _instance = nullptr;
return _instance;
}
//______________________________________________________________________________