Import Geant4 11.2.2 source tree

source/analysis/History

@@ -6,6 +6,15 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-06-05 I. Hrivnacova (analysis-V11-01-11)
+- Do not delete G4Accumulable<T> default constructor,
+  as it prevents from using it in an array without an explicit
+  initialization in the header.
+
+## 2024-05-02 Gabriele Cosmo
+- Fixed wrong conversion to G4String in G4THnToolsManager, leading to
+  compilation error on gcc compiler with C++23 Standard enabled.
+
 ## 2023-11-03 Ben Morgan (analysis-V11-01-10)
 - Use "G4" prefixed version of EXPAT/ZLIB CMake variables
 

source/analysis/accumulables/include/G4Accumulable.hh

@@ -42,11 +42,10 @@ class G4Accumulable : public G4VAccumulable
   public:
     G4Accumulable(const G4String& name, T initValue,
                 G4MergeMode mergeMode = G4MergeMode::kAddition);
-    G4Accumulable(T initValue,
+    G4Accumulable(T initValue = 0,
                 G4MergeMode mergeMode = G4MergeMode::kAddition);
     G4Accumulable(const G4Accumulable& rhs);
     G4Accumulable(G4Accumulable&& rhs) noexcept;
-    G4Accumulable() = delete;
     ~G4Accumulable() override = default;
 
     // Operators

source/analysis/management/include/G4THnToolsManager.icc

@@ -297,7 +297,7 @@ template <unsigned int DIM, typename HT>
 G4String G4THnToolsManager<DIM, HT>::GetTitle(G4int id) const
 {
   auto ht = GetTInFunction(id, "GetTitle");
-  if (ht == nullptr) return 0;
+  if (ht == nullptr) return G4String();
 
   return ht->title();
 }
@@ -308,7 +308,7 @@ template <unsigned int DIM, typename HT>
 G4String G4THnToolsManager<DIM, HT>::GetAxisTitle(unsigned int idim, G4int id) const
 {
   auto ht = GetTInFunction(id, "GetAxisTitle");
-  if (ht == nullptr) return 0;
+  if (ht == nullptr) return G4String();
 
   G4String title;
   G4bool result = ht->annotation(fkKeyAxisTitle[idim], title);