COMP: Improve HDF5 DataSpace::ALL initialization

Per: https://www-igm.univ-mlv.fr/~dr/CPP/c++-faq/ctors.html#[10.12] [10.12] How do I prevent the "static initialization order fiasco" for my static data members?
KitwareMedical · Sep 17, 2023 · 30cb633 · 30cb633
1 parent ed2b1bc
commit 30cb633
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Modules/ThirdParty/HDF5/src/itkhdf5/c++/src/H5DataSpace.cpp b/Modules/ThirdParty/HDF5/src/itkhdf5/c++/src/H5DataSpace.cpp
@@ -27,7 +27,7 @@ namespace H5 {
 // in "H5PredType.cpp" for information.
 
 // Initialize a pointer for the constant
-DataSpace *DataSpace::ALL_ = 0;
+//DataSpace *DataSpace::ALL_ = 0;
 
 //--------------------------------------------------------------------------
 // Function:    DataSpace::getConstant
@@ -49,6 +49,7 @@ DataSpace::getConstant()
         IdComponent::H5dontAtexit_called = true;
     }
 
+/*
     // If the constant pointer is not allocated, allocate it. Otherwise,
     // throw because it shouldn't be.
     if (ALL_ == 0)
@@ -64,6 +65,8 @@ DataSpace::getConstant()
         throw DataSpaceIException("DataSpace::getConstant",
                                   "DataSpace::getConstant is being invoked on an allocated ALL_");
 #endif
+*/
+    static DataSpace *ALL_ = new DataSpace(H5S_ALL);
     return (ALL_);
 }
 
@@ -75,6 +78,7 @@ DataSpace::getConstant()
 void
 DataSpace::deleteConstants()
 {
+    DataSpace *ALL_ = getConstant();
     if (ALL_ != 0)
         delete ALL_;
 }

diff --git a/Modules/ThirdParty/HDF5/src/itkhdf5/c++/src/H5DataSpace.h b/Modules/ThirdParty/HDF5/src/itkhdf5/c++/src/H5DataSpace.h
@@ -142,7 +142,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-    static DataSpace *ALL_;
+    //static DataSpace *ALL_;
 
     // Creates the global constant
     static DataSpace *getConstant();