Import Geant4 11.3.0 source tree

source/persistency/mctruth/include/G4DCIOentryT.hh

@@ -34,7 +34,6 @@
 #ifndef G4DCIOENTRYT_HH
 #define G4DCIOENTRYT_HH 1
 
-#include <string>
 #include "G4Types.hh"
 #include "G4VPDigitsCollectionIO.hh"
 
@@ -46,7 +45,7 @@ class G4DCIOentryT : public G4VDCIOentry
 {
   public:
 
-    G4DCIOentryT<T>(std::string n) : G4VDCIOentry(n)
+    G4DCIOentryT<T>(const G4String& n) : G4VDCIOentry(n)
     {
       if(m_verbose > 2)
       {

source/persistency/mctruth/include/G4FileUtilities.hh

@@ -37,15 +37,6 @@
 #include "G4Types.hh"
 #include "G4String.hh"
 
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-#include <iostream>
-
 class G4FileUtilities
 {
   public:
@@ -59,10 +50,10 @@ class G4FileUtilities
     G4bool FileExists(const G4String& file);
       // checks if the "file" exists.  returns true if it does
 
-    std::string StrErrNo() const { return ::strerror(errno); }
+    G4String StrErrNo() const;
       // returns the error message of the last system call as string
 
-    G4int Shell(const G4String& str) { return ::system(str.c_str()); }
+    G4int Shell(const G4String& str);
       // executes the shell command.  returns zero if success
 
     G4int CopyFile(const G4String& srcFile, const G4String& dstFile);
@@ -71,9 +62,8 @@ class G4FileUtilities
     G4int DeleteFile(const G4String& file, const G4String& option);
       // deletes the "file" with the "option".  returns zero if success
 
-    std::string GetEnv(const G4String& env) { return ::getenv(env.c_str()); }
+    G4String GetEnv(const G4String& env);
       // retuns the value of environment variable as string
-
 };
 
 #endif

source/persistency/mctruth/include/G4HCIOcatalog.hh

@@ -41,10 +41,8 @@
 
 class G4VHCIOentry;
 
-using HCIOmap = std::map<std::string, G4VHCIOentry*, std::less<std::string>>;
-
-using HCIOstore = std::map<G4String, G4VPHitsCollectionIO*,
-                           std::less<G4String>>;
+using HCIOmap = std::map<G4String, G4VHCIOentry*, std::less<G4String>>;
+using HCIOstore = std::map<G4String, G4VPHitsCollectionIO*, std::less<G4String>>;
 
 class G4HCIOcatalog
 {

source/persistency/mctruth/include/G4HCIOentryT.hh

@@ -34,7 +34,6 @@
 #ifndef G4HCIOENTRYT_HH
 #define G4HCIOENTRYT_HH 1
 
-#include <string>
 #include "G4Types.hh"
 #include "G4VPHitsCollectionIO.hh"
 

source/persistency/mctruth/include/G4MCTSimParticle.hh

@@ -31,7 +31,6 @@
 #define G4MCTSIMPARTICLE_HH 1
 
 #include <vector>
-#include <string>
 #include <iostream>
 
 #include "G4String.hh"
@@ -63,7 +62,7 @@ class G4MCTSimParticle
     inline void SetParentParticle(const G4MCTSimParticle* p);
     inline G4MCTSimParticle* GetParentParticle() const;
 
-    inline void SetParticleName(std::string aname);
+    inline void SetParticleName(const G4String& aname);
     inline const G4String& GetParticleName() const;
 
     inline void SetPdgID(G4int id);
@@ -147,7 +146,7 @@ inline G4MCTSimParticle* G4MCTSimParticle::GetParentParticle() const
   return parentParticle;
 }
 
-inline void G4MCTSimParticle::SetParticleName(std::string aname)
+inline void G4MCTSimParticle::SetParticleName(const G4String& aname)
 {
   name = aname;
 }

source/persistency/mctruth/include/G4MCTSimVertex.hh

@@ -32,7 +32,6 @@
 
 #include <iostream>
 #include <vector>
-#include <string>
 
 #include "G4Types.hh"
 #include "G4ThreeVector.hh"

source/persistency/mctruth/include/G4PersistencyCenter.hh

@@ -34,10 +34,10 @@
 #ifndef G4PERSISTENCYCENTER_HH
 #define G4PERSISTENCYCENTER_HH 1
 
-#include "G4Types.hh"
-#include <string>
 #include <vector>
 #include <map>
+
+#include "G4Types.hh"
 #include "G4HCIOcatalog.hh"
 #include "G4DCIOcatalog.hh"
 

source/persistency/mctruth/include/G4PersistencyCenterMessenger.hh

@@ -72,8 +72,8 @@ class G4PersistencyCenterMessenger : public G4UImessenger
     G4UIcmdWithAnInteger* verboseCmd = nullptr;
     G4UIcmdWithAString* select = nullptr;
     G4UIcmdWithAString* regHitIO = nullptr;
-    std::vector<std::string> wrObj;
-    std::vector<std::string> rdObj;
+    std::vector<G4String> wrObj;
+    std::vector<G4String> rdObj;
     std::vector<G4UIcmdWithAString*> storeObj;
     std::vector<G4UIcmdWithAString*> setWrFile;
     std::vector<G4UIcmdWithAString*> setRdFile;

source/persistency/mctruth/include/G4VTransactionManager.hh

@@ -36,7 +36,6 @@
 #define G4VTRANSACTIONMANAGER_HH 1
 
 #include "G4Types.hh"
-#include <string>
 
 class G4VTransactionManager
 {
@@ -48,13 +47,15 @@ class G4VTransactionManager
     virtual ~G4VTransactionManager() {}
       // Destructor
 
-    void SetVerboseLevel(int v) { m_verbose = v; }
+    void SetVerboseLevel(G4int v) { m_verbose = v; }
       // Set verbose level
 
-    virtual G4bool SelectReadFile(std::string obj, std::string file) = 0;
+    virtual G4bool SelectReadFile(const G4String& obj,
+                                  const G4String& file) = 0;
       // Set the input file name and open it for the object type "obj"
 
-    virtual G4bool SelectWriteFile(std::string obj, std::string file) = 0;
+    virtual G4bool SelectWriteFile(const G4String& obj,
+                                   const G4String& file) = 0;
       // Set the output file name and open it for the object type "obj"
 
     virtual G4bool StartUpdate() = 0;