Changeset 921 for trunk/source/geometry/volumes

Timestamp:

Feb 16, 2009, 10:14:30 AM (17 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

Location:

trunk/source/geometry/volumes

Files:

• History (modified) (2 diffs)
• include/G4ReflectionFactory.hh (modified) (2 diffs)
• src/G4ReflectionFactory.cc (modified) (4 diffs)

trunk/source/geometry/volumes/History

@@ -1 @@
-$Id: History,v 1.153 2008/08/19 15:32:14 gcosmo Exp $
+$Id: History,v 1.155 2008/11/13 09:35:03 gcosmo Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Nov 13th, 2008      G.Cosmo - geomvol-V09-01-03
+- Corrected singleton definition for G4ReflectionFactory.
+- Return 'const G4String&' instead of copy in GetVolumesNameExtension().
 
 Aug 19th, 2008      G.Cosmo - geomvol-V09-01-02

trunk/source/geometry/volumes/include/G4ReflectionFactory.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectionFactory.hh,v 1.3 2006/06/29 18:57:39 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ReflectionFactory.hh,v 1.4 2008/11/13 09:33:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -152 +152 @@
 
     void     SetVolumesNameExtension(const G4String& nameExtension);
-    G4String GetVolumesNameExtension() const;
+    const G4String& GetVolumesNameExtension() const;
       // Returns the name extension for the reflected solids
       // and logical volumes.

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ReflectionFactory.cc,v 1.6 2007/05/11 13:58:35 gcosmo Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ReflectionFactory.cc,v 1.9 2008/11/13 09:33:20 gcosmo Exp $
+// GEANT4 tag $Name: geant4-09-02-cand-01 $
 //
 // 
@@ -75 +75 @@
   // ---
 
-  if (!fInstance) new G4ReflectionFactory();
-  
+  if (!fInstance) { fInstance = new G4ReflectionFactory(); }
+
   return fInstance;
 }  
@@ -98 +98 @@
 G4ReflectionFactory::~G4ReflectionFactory()
 {
+  delete fInstance;
 }
 
@@ -862 +863 @@
 //_____________________________________________________________________________
 
-G4String G4ReflectionFactory::GetVolumesNameExtension() const
+const G4String& G4ReflectionFactory::GetVolumesNameExtension() const
 {
   return fNameExtension;