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

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/visualization/RayTracer/include/G4RayTrajectory.hh
+7 -8
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4RayTrajectory.hh 71495 2013-06-17 09:13:30Z gcosmo $
//
//
@@ -75,7 +75,6 @@ class G4RayTrajectory : public G4VTrajectory
virtual void AppendStep(const G4Step*);
virtual void ShowTrajectory(std::ostream&) const;
virtual void DrawTrajectory() const {;}
virtual void DrawTrajectory(G4int) const {;}
virtual int GetPointEntries() const {return positionRecord->size();}
virtual G4VTrajectoryPoint* GetPoint(G4int i) const
{ return (*positionRecord)[i]; }
@@ -97,21 +96,21 @@ class G4RayTrajectory : public G4VTrajectory
};
#if defined G4VIS_ALLOC_EXPORT
extern G4DLLEXPORT G4Allocator<G4RayTrajectory> G4RayTrajectoryAllocator;
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4RayTrajectory>* rayTrajectoryAllocator;
#else
extern G4DLLIMPORT G4Allocator<G4RayTrajectory> G4RayTrajectoryAllocator;
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4RayTrajectory>* rayTrajectoryAllocator;
#endif
inline void* G4RayTrajectory::operator new(size_t)
{
void* aTrajectory;
aTrajectory = (void*)G4RayTrajectoryAllocator.MallocSingle();
return aTrajectory;
if(!rayTrajectoryAllocator)
{ rayTrajectoryAllocator = new G4Allocator<G4RayTrajectory>; }
return (void*)rayTrajectoryAllocator->MallocSingle();
}
inline void G4RayTrajectory::operator delete(void* aTrajectory)
{
G4RayTrajectoryAllocator.FreeSingle((G4RayTrajectory*)aTrajectory);
rayTrajectoryAllocator->FreeSingle((G4RayTrajectory*)aTrajectory);
}