Changeset 1315 for trunk/source/geometry/volumes/src

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

Location:

trunk/source/geometry/volumes/src

Files:

• G4NavigationHistory.cc (modified) (3 diffs)
• G4ReflectionFactory.cc (modified) (2 diffs)

trunk/source/geometry/volumes/src/G4NavigationHistory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4NavigationHistory.cc,v 1.11 2009/08/03 16:27:37 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4NavigationHistory.cc,v 1.15 2010/04/22 09:06:50 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -38 +38 @@
 #include "G4ios.hh"
 
+// Initialise static data for the specialized memory pool
+// for the internal STL vector of histories  ...
+//
+G4ChunkIndexType* G4AllocStats::allocStat = 0;
+G4int             G4AllocStats::totSpace = 0;
+G4int             G4AllocStats::numCat = 0;
+
 G4NavigationHistory::G4NavigationHistory()
   : fNavHistory(kHistoryMax), fStackDepth(0)
@@ -45 +52 @@
 
 G4NavigationHistory::G4NavigationHistory(const G4NavigationHistory &h)
-  : fNavHistory(h.fNavHistory), fStackDepth(h.fStackDepth)
+  : fStackDepth(h.fStackDepth)
 {
+  fNavHistory.assign(h.fNavHistory.begin(),h.fNavHistory.end());
 }
 

trunk/source/geometry/volumes/src/G4ReflectionFactory.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectionFactory.cc,v 1.9 2008/11/13 09:33:20 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ReflectionFactory.cc,v 1.10 2010/04/13 07:19:01 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // 
@@ -761 +761 @@
 //_____________________________________________________________________________
 
+void
+G4ReflectionFactory::Reset()
+{
+  fConstituentLVMap.~map();
+  fReflectedLVMap.~map();
+}
+
+//_____________________________________________________________________________
+
 void G4ReflectionFactory::PrintConstituentLVMap()
 {