Import Geant4 10.6.1 source tree

source/global/History

@@ -16,6 +16,18 @@ commit in the repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+December 03, 2019 Gabriele Cosmo (global-V10-05-27)
+- Updated tag IDs for release 10.6.p01.
+
+January 30, 2020 Gabriele Cosmo
+- Fixed symbol exporting problem in G4coutDestination on Windows; define
+  'masterG4coutDestination' static pointer as a normal pointer.
+  Addressing problem report #2217.
+
+January 14, 2020 Gabriele Cosmo
+- Added windefs.hh header, including protections for double definition
+  of global symbols from Windows Kits code.
+
 December 03, 2019 Gabriele Cosmo (global-V10-05-26)
 - Updated tag IDs for release 10.6.
 

source/global/management/include/G4Version.hh

@@ -40,11 +40,11 @@
 //     |--> patch number
 
 #ifndef G4VERSION_NUMBER
-#define G4VERSION_NUMBER  1060
+#define G4VERSION_NUMBER  1061
 #endif
 
 #ifndef G4VERSION_TAG
-#define G4VERSION_TAG "$Name: geant4-10-06 $"
+#define G4VERSION_TAG "$Name: geant4-10-06-patch-01 $"
 #endif
 
 // as variables
@@ -53,10 +53,10 @@
 #include "G4String.hh"
 
 #ifdef G4MULTITHREADED
-static const G4String G4Version = "$Name: geant4-10-06 [MT]$";
+static const G4String G4Version = "$Name: geant4-10-06-patch-01 [MT]$";
 #else
-static const G4String G4Version = "$Name: geant4-10-06 $";
+static const G4String G4Version = "$Name: geant4-10-06-patch-01 $";
 #endif
-static const G4String G4Date    = "(6-December-2019)";
+static const G4String G4Date    = "(14-February-2020)";
 
 #endif

source/global/management/include/G4coutDestination.hh

@@ -91,7 +91,7 @@ class G4coutDestination
     // derived class should set this pointer.
     // Needed for some G4UIsession like GUIs
     //
-    static G4coutDestination* masterG4coutDestination;
+    G4coutDestination* masterG4coutDestination = nullptr;
 
     std::vector<Transformer> transformersCout;
     std::vector<Transformer> transformersCerr;

source/global/management/include/windefs.hh

@@ -0,0 +1,44 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// GEANT 4 class header file
+//
+// Class Description:
+//
+// This file includes protections from Windows declarations in the
+// global scope that may cause trouble in compilation.
+
+// --------------------------------------------------------------------
+#ifndef windefs_hh
+#define windefs_hh
+
+#if defined(_WIN32)
+  #if defined (ABSOLUTE)
+    #undef ABSOLUTE
+    #undef RELATIVE
+  #endif
+#endif // _WIN32
+
+#endif // windefs_hh

source/global/management/sources.cmake

@@ -49,6 +49,7 @@ GEANT4_DEFINE_MODULE(NAME G4globman
         globals.hh
         templates.hh
         tls.hh
+        windefs.hh
         G4Allocator.hh
         G4AutoDelete.hh
         G4ios.hh

source/global/management/src/G4coutDestination.cc

@@ -33,8 +33,6 @@
 
 #include <algorithm>
 
-G4coutDestination* G4coutDestination::masterG4coutDestination = 0;
-
 G4coutDestination::~G4coutDestination()
 {
 }