Import Geant4 10.2.0 source tree

source/intercoms/History

@@ -1,4 +1,4 @@
-$Id: History 85912 2014-11-06 08:57:43Z gcosmo $
+$Id: History 94366 2015-11-13 08:15:49Z gcosmo $
 -------------------------------------------------------------------
 
      =========================================================
@@ -16,6 +16,23 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+12 November, 2015 Laurent Garnier (intercoms-V10-01-03)
+- G4UImanager : Coverity fixes
+
+26 May, 2015 Robert Hatcher (intercoms-V10-01-02)
+- clang 3.4 doesn't have <type_traits> but 3.5 does; as does vc12.
+  So can't rely on anything other than std:: namespace to avoid a clash;
+  track down "using namespace std" issues in various processes packages
+
+22 May, 2015 Robert Hatcher (intercoms-V10-01-01)
+- Deal with implementation of remove_reference in G4AnyMethod for cases 
+  where one is compiling with the C++11 standard or clang and a
+  "using namespace std" causes a clash
+
+05 May, 2015 Andrea Dotti (intercoms-V10-01-00)
+- Using new IsMasterThread() function as suggested by J.Allison
+
 05 November, 2014  Robert Hatcher  (intercoms-V10-00-15)
 - Rename a few inline method parameter names from 's' to 's0' 
   to avoid a clash with CLHEP global 's'

source/intercoms/include/G4AnyMethod.hh

@@ -56,12 +56,25 @@ public:
   }
 };
 
+#if defined(G4USE_STD11) || defined(G4USE_STD14)
+  #include <type_traits>
+  using std::remove_reference;
+// original usage below in G4AnyMethod (pre C++11) was without namespace std::
+// so if compiler has them, make them available without the namespace
+#else
+// these are the reference "possible implementations" of a C++11 feature
+//   c.f. http://en.cppreference.com/w/cpp/types/remove_reference
+// but they clash badly with C++11 definitions supplied by the compiler
+// so use them only if C++11 is not enabled or there is no possibility 
+// of clashing with the ones defined in std:: namespace
+// (i.e. avoid "using namespace std")
 template<typename T> struct remove_reference {typedef T type;};
 template<typename T> struct remove_reference<T&> {typedef T type;};
 template<typename T> struct remove_reference<const T&> {typedef T type;};
+#endif
 
 /**
- * @class G4AnyMethod G4AnyMothod.hh
+ * @class G4AnyMethod G4AnyMethod.hh
  * This class represents any object method. The class only holds a member pointer.
  */
 class G4AnyMethod {

source/intercoms/src/G4UIcommand.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIcommand.cc 84281 2014-10-13 07:21:50Z gcosmo $
+// $Id: G4UIcommand.cc 89953 2015-05-06 08:09:12Z gcosmo $
 //
 // 
 
@@ -225,7 +225,7 @@ G4int G4UIcommand::DoIt(G4String parameterList)
   if(CheckNewValue( correctParameters ))
   { return fParameterOutOfRange+99; }
 
-  if(workerThreadOnly && !G4Threading::IsWorkerThread()) return 0;
+  if(workerThreadOnly && G4Threading::IsMasterThread()) return 0;
 
   messenger->SetNewValue( this, correctParameters );
   return 0;

source/intercoms/src/G4UImanager.cc

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 //
-// $Id: G4UImanager.cc 85249 2014-10-27 08:28:57Z gcosmo $
+// $Id: G4UImanager.cc 94366 2015-11-13 08:15:49Z gcosmo $
 //
 //
 // ---------------------------------------------------------------------
@@ -144,6 +144,20 @@ G4UImanager::G4UImanager(const G4UImanager& ui)
   savedCommand= ui.savedCommand;
   session = ui.session;
   treeTop = ui.treeTop;
+  verboseLevel = ui.verboseLevel;
+  saveHistory = ui.saveHistory;
+  CoutMessenger = 0;
+  maxHistSize = ui.maxHistSize;
+  pauseAtBeginOfEvent = ui.pauseAtBeginOfEvent;
+  pauseAtEndOfEvent = ui.pauseAtEndOfEvent;
+  isMaster = ui.isMaster;
+  bridges = ui.bridges;
+  ignoreCmdNotFound = ui.ignoreCmdNotFound;
+  stackCommandsForBroadcast = ui.stackCommandsForBroadcast;
+  commandStack = ui.commandStack;
+  threadID = ui.threadID;
+  threadCout = ui.threadCout;
+  CreateMessenger();
 }
 
 const G4UImanager & G4UImanager::operator=(const G4UImanager &right)