Import Geant4 9.6.0 source tree

source/persistency/mctruth/src/G4FileUtilities.cc

@@ -47,8 +47,8 @@ G4bool G4FileUtilities::FileExists(const std::string file)
 {
   char* c = (char *) file.c_str();
 
-  int fd = ::open( c, O_RDONLY ); 
-  // int error = errno;
+  G4int fd = ::open( c, O_RDONLY ); 
+  // G4int error = errno;
   if ( fd != -1 ) {
     ::close( fd );
     return true;
@@ -58,14 +58,14 @@ G4bool G4FileUtilities::FileExists(const std::string file)
 }
 
 // Implementation of CopyFile
-int G4FileUtilities::CopyFile(const std::string srcFile, const std::string dstFile)
+G4int G4FileUtilities::CopyFile(const std::string srcFile, const std::string dstFile)
 {
   std::string cmd = "cp " + srcFile + " " + dstFile;
   return Shell( cmd );
 }
 
 // Implementation of DeleteFile
-int G4FileUtilities::DeleteFile(const std::string file, const std::string option)
+G4int G4FileUtilities::DeleteFile(const std::string file, const std::string option)
 {
   std::string cmd = "rm " + option + " " + file;
   return Shell( cmd );

source/persistency/mctruth/src/G4MCTSimParticle.cc

@@ -27,11 +27,14 @@
 //
 // ====================================================================
 
-#include "globals.hh"
 #include <sstream>
 #include <iomanip>
-#include "G4ios.hh"
+
 #include "G4MCTSimParticle.hh"
+
+#include "globals.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4ios.hh"
 #include "G4MCTSimVertex.hh"
 
 // ====================================================================

source/persistency/mctruth/src/G4MCTSimVertex.cc

@@ -27,12 +27,15 @@
 //
 // ====================================================================
 
-#include "globals.hh"
 #include <sstream>
 #include <iomanip>
+
+#include "G4MCTSimVertex.hh"
+
+#include "globals.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4ios.hh"
 #include "G4MCTSimParticle.hh"
-#include "G4MCTSimVertex.hh"
 
 // ====================================================================
 //

source/persistency/mctruth/src/G4PersistencyCenter.cc

@@ -75,13 +75,6 @@ G4PersistencyCenter::G4PersistencyCenter()
   f_currentManager = new G4PersistencyManager(this, "Default");
 }
 
-// Fake implementation of Copy Constructor
-G4PersistencyCenter::G4PersistencyCenter(const G4PersistencyCenter& c)
-  : f_theMessenger(0), f_currentManager(0), m_verbose(0)
-{
-  *this = c;
-}
-
 // Implementation of Destructor #1
 G4PersistencyCenter::~G4PersistencyCenter()
 {

source/persistency/mctruth/src/G4PersistencyCenterMessenger.cc

@@ -202,7 +202,7 @@ void G4PersistencyCenterMessenger::SetNewValue(G4UIcommand* command, G4String ne
 // Implementation of GetCurrentValue
 G4String G4PersistencyCenterMessenger::GetCurrentValue(G4UIcommand* command)
 {
-  G4String s="Undefined";
+  G4String ustr="Undefined";
 
   if (command==select)
   {
@@ -247,7 +247,7 @@ G4String G4PersistencyCenterMessenger::GetCurrentValue(G4UIcommand* command)
     }
   }
 
-  return s;
+  return ustr;
 }
 
 // Implementation of PopWord

source/persistency/mctruth/src/G4PersistencyManager.cc

@@ -35,8 +35,8 @@
 #include "G4PersistencyCenter.hh"
 
 // Implementation of Constructor #1
-G4PersistencyManager::G4PersistencyManager(G4PersistencyCenter* pc, std::string n)
- : f_pc(pc), nameMgr(n), f_is_initialized(false)
+G4PersistencyManager::G4PersistencyManager(G4PersistencyCenter* ptc, std::string n)
+ : f_pc(ptc), nameMgr(n), f_is_initialized(false)
 {
   m_verbose = f_pc->VerboseLevel();
 }