TileDB: avoid -Wshadow-field (master only)

PPazderski · Nov 4, 2023 · 473a828 · 473a828
1 parent c1aa9da
commit 473a828
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/frmts/tiledb/tiledbmultidim.h b/frmts/tiledb/tiledbmultidim.h
@@ -161,7 +161,6 @@ class TileDBGroup final : public GDALGroup, public TileDBAttributeHolder
 {
     std::shared_ptr<TileDBSharedResource> m_poSharedResource{};
     const std::string m_osPath;
-    std::weak_ptr<TileDBGroup> m_pSelf{};
     mutable std::unique_ptr<tiledb::Group> m_poTileDBGroup{};
     mutable std::map<std::string, std::shared_ptr<TileDBGroup>> m_oMapGroups{};
     mutable std::map<std::string, std::shared_ptr<TileDBArray>> m_oMapArrays{};
@@ -183,7 +182,7 @@ class TileDBGroup final : public GDALGroup, public TileDBAttributeHolder
     {
         auto poGroup = std::shared_ptr<TileDBGroup>(
             new TileDBGroup(poSharedResource, osParentName, osName, osPath));
-        poGroup->m_pSelf = poGroup;
+        poGroup->SetSelf(poGroup);
         return poGroup;
     }
 

diff --git a/frmts/tiledb/tiledbmultidimgroup.cpp b/frmts/tiledb/tiledbmultidimgroup.cpp
@@ -522,7 +522,7 @@ std::shared_ptr<GDALMDArray> TileDBGroup::CreateMDArray(
     if (!EnsureOpenAs(TILEDB_WRITE))
         return nullptr;
 
-    auto poSelf = m_pSelf.lock();
+    auto poSelf = std::dynamic_pointer_cast<TileDBGroup>(m_pSelf.lock());
     CPLAssert(poSelf);
     auto poArray =
         TileDBArray::CreateOnDisk(m_poSharedResource, poSelf, osName,