From d1314c06d8040355e6a041db3b8cd9952ffc5b83 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 19 Nov 2023 19:47:03 +0100 Subject: [PATCH] Move static NameSpace::GLOBAL definition in static.cpp to avoid 'static initialization fiasco' (fixes various Coverity warnings) --- src/iso19111/static.cpp | 4 ++++ src/iso19111/util.cpp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/iso19111/static.cpp b/src/iso19111/static.cpp index 3c4c8ddced..9362610311 100644 --- 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 index 70f738b8af..e72f3af7b0 100644 --- 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{};