Import Geant4 11.1.0.beta source tree

source/externals/g4tools/include/tools/wroot/date

@@ -28,13 +28,13 @@ inline date get_date(){
   struct tm tpa;
   struct tm *tp = (tm*)::localtime_r(&tloc, &tpa); //does not exist on Windows.
 #endif
-  unsigned int year   = tp->tm_year;
-  unsigned int month  = tp->tm_mon + 1;
-  unsigned int day    = tp->tm_mday;
-  unsigned int hour   = tp->tm_hour;
-  unsigned int min    = tp->tm_min;
-  unsigned int sec    = tp->tm_sec;
-  return ((year-95)<<26 | month<<22 | day<<17 | hour<<12 | min<<6 | sec);
+  unsigned int _year   = tp->tm_year;
+  unsigned int _month  = tp->tm_mon + 1;
+  unsigned int _day    = tp->tm_mday;
+  unsigned int _hour   = tp->tm_hour;
+  unsigned int _min    = tp->tm_min;
+  unsigned int _sec    = tp->tm_sec;
+  return ((_year-95)<<26 | _month<<22 | _day<<17 | _hour<<12 | _min<<6 | _sec);
 }
 
 }}

source/externals/g4tools/include/tools/wroot/element

@@ -80,9 +80,9 @@ public:
   virtual void out(std::ostream& aOut) const {
     std::string _fname;
     fullName(_fname);
-    char s[256];
-    snpf(s,sizeof(s),"  %-14s%-15s offset=%3d type=%2d %-20s",fTypeName.c_str(),_fname.c_str(),fOffset,fType,fTitle.c_str());
-    aOut << s << std::endl;
+    char _s[256];
+    snpf(_s,sizeof(_s),"  %-14s%-15s offset=%3d type=%2d %-20s",fTypeName.c_str(),_fname.c_str(),fOffset,fType,fTitle.c_str());
+    aOut << _s << std::endl;
   }
 public:
   streamer_element(const std::string& aName,const std::string& aTitle,

source/externals/g4tools/include/tools/wroot/mpi_ntuple_column_wise

@@ -4,7 +4,7 @@
 #ifndef tools_wroot_mpi_ntuple_column_wise
 #define tools_wroot_mpi_ntuple_column_wise
 
-// MPI pntuple. It uses the inlib/impi interface.
+// MPI pntuple. It uses the tools/impi interface.
 
 #include "base_pntuple_column_wise"
 #include "mpi_basket_add"

source/externals/g4tools/include/tools/wroot/mpi_ntuple_row_wise

@@ -4,7 +4,7 @@
 #ifndef tools_wroot_mpi_ntuple_row_wise
 #define tools_wroot_mpi_ntuple_row_wise
 
-// MPI pntuple. It uses the inlib/impi interface.
+// MPI pntuple. It uses the tools/impi interface.
 
 #include "base_pntuple_row_wise"
 #include "mpi_basket_add"