Import Geant4 10.5.1 source tree

source/g3tog4/History

@@ -2,6 +2,12 @@
 G3toG4 Modification History (reverse chronological order, please !)
 --------------------------------------------------------------------
 
+g3tog4-V10-04-01 31-January-2019 I.Hrivnacova
+- Merged GitHub PR #4: all Boolean operators now return G4bool.
+
+19-December-2018 G.Cosmo
+- Fixed shadowing compilation warning in G3toG4MakeSolid.
+
 g3tog4-V10-04-00 9-November-2018 G.Cosmo
 - G3Division: fixed printout typo.
 

source/g3tog4/include/G3MatTableEntry.hh

@@ -52,8 +52,8 @@ class G3MatTableEntry
     
     // operators
     G3MatTableEntry& operator=(const G3MatTableEntry& right);
-    G4int operator==(const G3MatTableEntry& right) const;
-    G4int operator!=(const G3MatTableEntry& right) const;
+    G4bool operator==(const G3MatTableEntry& right) const;
+    G4bool operator!=(const G3MatTableEntry& right) const;
 
     // get methods
     G4int       GetID() const;

source/g3tog4/include/G3MedTableEntry.hh

@@ -56,8 +56,8 @@ class G3MedTableEntry
     
     // operators
     G3MedTableEntry& operator=(const G3MedTableEntry& right);
-    G4int operator==(const G3MedTableEntry& right) const;
-    G4int operator!=(const G3MedTableEntry& right) const;
+    G4bool operator==(const G3MedTableEntry& right) const;
+    G4bool operator!=(const G3MedTableEntry& right) const;
 
     // set methods
     void SetMaterial(G4Material* material);

source/g3tog4/include/G3RotTableEntry.hh

@@ -53,8 +53,8 @@ class G3RotTableEntry
     
     // operators
     G3RotTableEntry& operator=(const G3RotTableEntry& right);
-    G4int operator==(const G3RotTableEntry& right) const;
-    G4int operator!=(const G3RotTableEntry& right) const;
+    G4bool operator==(const G3RotTableEntry& right) const;
+    G4bool operator!=(const G3RotTableEntry& right) const;
 
     // get methods
     G4int       GetID() const;

source/g3tog4/src/G3MatTableEntry.cc

@@ -52,19 +52,19 @@ G3MatTableEntry& G3MatTableEntry::operator=(const G3MatTableEntry& right)
   return *this;
 }
 
-G4int G3MatTableEntry::operator==(const G3MatTableEntry& right) const
+G4bool G3MatTableEntry::operator==(const G3MatTableEntry& right) const
 { 
   if (fID == right.GetID()) 
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
-G4int G3MatTableEntry::operator!=(const G3MatTableEntry& right) const
+G4bool G3MatTableEntry::operator!=(const G3MatTableEntry& right) const
 { 
   if (*this == right) 
-    return 0;
+    return false;
   else
-    return 1;
+    return true;
 }
 

source/g3tog4/src/G3MedTableEntry.cc

@@ -64,19 +64,19 @@ G3MedTableEntry& G3MedTableEntry::operator=(const G3MedTableEntry& right)
   return *this;
 }
 
-G4int G3MedTableEntry::operator==(const G3MedTableEntry& right) const
+G4bool G3MedTableEntry::operator==(const G3MedTableEntry& right) const
 { 
   if (fID == right.GetID()) 
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
-G4int G3MedTableEntry::operator!=(const G3MedTableEntry& right) const
+G4bool G3MedTableEntry::operator!=(const G3MedTableEntry& right) const
 { 
   if (*this == right) 
-    return 0;
+    return false;
   else
-    return 1;
+    return true;
 }
 

source/g3tog4/src/G3RotTableEntry.cc

@@ -52,19 +52,19 @@ G3RotTableEntry& G3RotTableEntry::operator=(const G3RotTableEntry& right)
   return *this;
 }
 
-G4int G3RotTableEntry::operator==(const G3RotTableEntry& right) const
+G4bool G3RotTableEntry::operator==(const G3RotTableEntry& right) const
 { 
   if (fID == right.GetID()) 
-    return 1;
+    return true;
   else
-    return 0;
+    return false;
 }
 
-G4int G3RotTableEntry::operator!=(const G3RotTableEntry& right) const
+G4bool G3RotTableEntry::operator!=(const G3RotTableEntry& right) const
 { 
   if (*this == right) 
-    return 0;
+    return false;
   else
-    return 1;
+    return true;
 }
 

source/g3tog4/src/G3toG4MakeSolid.cc

@@ -28,7 +28,6 @@
 // modified by I.Hrivnacova, V.Berejnoi 27 Sep 99 
 
 #include "globals.hh"
-#include "G4SystemOfUnits.hh"
 #include "G4Box.hh"
 #include "G4Tubs.hh"
 #include "G4Trd.hh"
@@ -42,7 +41,8 @@
 #include "G4Hype.hh"
 #include "G4EllipticalTube.hh"
 #include "G3toG4MakeSolid.hh"
-        
+#include "G4SystemOfUnits.hh"
+
 G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape, 
 			  const G4double* rpar, const G4int npar, 
 			  G4bool& NegVolPars, G4bool& Deferred,