Merge pull request #3955 from rouault/coverity_GLOBAL_INIT_ORDER

Move static NameSpace::GLOBAL definition in static.cpp to avoid 'static initialization fiasco' (fixes various Coverity warnings)
OSGeo · Nov 19, 2023 · 72f9084 · 72f9084
2 parents b124309 + d1314c0
commit 72f9084
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp
@@ -66,6 +66,10 @@ NS_PROJ_START
 
 // ---------------------------------------------------------------------------
 
+const NameSpaceNNPtr NameSpace::GLOBAL(NameSpace::createGLOBAL());
+
+// ---------------------------------------------------------------------------
+
 /** \brief Key to set the authority citation of a metadata::Identifier.
  *
  * The value is to be provided as a string or a metadata::Citation.

diff --git a/src/iso19111/util.cpp b/src/iso19111/util.cpp
@@ -494,10 +494,6 @@ NameSpaceNNPtr NameSpace::createGLOBAL() {
 
 // ---------------------------------------------------------------------------
 
-const NameSpaceNNPtr NameSpace::GLOBAL(NameSpace::createGLOBAL());
-
-// ---------------------------------------------------------------------------
-
 //! @cond Doxygen_Suppress
 struct LocalName::Private {
     NameSpacePtr scope{};