Use gz::utils::NeverDestroyed

Signed-off-by: Steve Peters <[email protected]>
gazebosim · Jul 31, 2024 · 3fa9854 · 3fa9854
1 parent 051b74f
commit 3fa9854
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/include/gz/math/graph/Edge.hh b/include/gz/math/graph/Edge.hh
@@ -25,7 +25,8 @@
 #include <set>
 
 #include <gz/math/config.hh>
-#include "gz/math/graph/Vertex.hh"
+#include <gz/math/graph/Vertex.hh>
+#include <gz/utils/NeverDestroyed.hh>
 
 namespace gz::math
 {
@@ -342,9 +343,9 @@ namespace graph
   template<typename E, typename EdgeType>
   EdgeType &NullEdge()
   {
-    static EdgeType e(
+    static gz::utils::NeverDestroyed<EdgeType> e(
       VertexId_P(kNullId, kNullId), E(), 1.0, kNullId);
-    return e;
+    return e.Access();
   }
 }  // namespace graph
 }  // namespace GZ_MATH_VERSION_NAMESPACE

diff --git a/include/gz/math/graph/Vertex.hh b/include/gz/math/graph/Vertex.hh
@@ -27,6 +27,7 @@
 
 #include <gz/math/config.hh>
 #include <gz/math/Helpers.hh>
+#include <gz/utils/NeverDestroyed.hh>
 
 namespace gz::math
 {
@@ -143,8 +144,8 @@ namespace graph
   template<typename V>
   Vertex<V> &NullVertex()
   {
-    static Vertex<V> v("__null__", V(), kNullId);
-    return v;
+    static gz::utils::NeverDestroyed<Vertex<V>> v("__null__", V(), kNullId);
+    return v.Access();
   }
 
   /// \def VertexRef_M