Merge pull request #1589 from Idclip/treetype_gcc_fix

Fixed a crash with GCC11 in Tree::treeType()

Author: Idclip

openvdb/openvdb/tree/Tree.h

@@ -1038,13 +1038,8 @@ class Tree: public TreeBase
     RootNodeType mRoot; // root node of the tree
     mutable AccessorRegistry mAccessorRegistry;
     mutable ConstAccessorRegistry mConstAccessorRegistry;
-
-    static std::unique_ptr<const Name> sTreeTypeName;
 }; // end of Tree class
 
-template<typename _RootNodeType>
-std::unique_ptr<const Name> Tree<_RootNodeType>::sTreeTypeName;
-
 
 /// @brief Tree3<T, N1, N2>::Type is the type of a three-level tree
 /// (Root, Internal, Leaf) with value type T and
@@ -1829,19 +1824,19 @@ template<typename RootNodeType>
 inline const Name&
 Tree<RootNodeType>::treeType()
 {
-    static std::once_flag once;
-    std::call_once(once, []()
+    static std::string sTreeTypeName = []()
     {
+        // @todo use RootNode::NodeChain::foreach() instead
         std::vector<Index> dims;
         Tree::getNodeLog2Dims(dims);
         std::ostringstream ostr;
         ostr << "Tree_" << typeNameAsString<BuildType>();
         for (size_t i = 1, N = dims.size(); i < N; ++i) { // start from 1 to skip the RootNode
             ostr << "_" << dims[i];
         }
-        sTreeTypeName.reset(new Name(ostr.str()));
-    });
-    return *sTreeTypeName;
+        return ostr.str();
+    }();
+    return sTreeTypeName;
 }
 
 

pendingchanges/init_fix.txt

@@ -0,0 +1,4 @@
+OpenVDB:
+    - Bug Fixes:
+        Fixed a bug when compiling with -fvisibility=hidden and GCC 11 which
+        would cause a crash in openvdb::initialize()