table: refactor NameTree hashtable
refs #3687
Change-Id: I908c1d7e67da861fc86a756fc0bc69b99ee696f7
diff --git a/daemon/table/name-tree-iterator.hpp b/daemon/table/name-tree-iterator.hpp
index a764677..fcc57b1 100644
--- a/daemon/table/name-tree-iterator.hpp
+++ b/daemon/table/name-tree-iterator.hpp
@@ -72,7 +72,7 @@
public:
Iterator();
- Iterator(shared_ptr<EnumerationImpl> impl, shared_ptr<Entry> ref);
+ Iterator(shared_ptr<EnumerationImpl> impl, const Entry* ref);
virtual
~Iterator() = default;
@@ -84,7 +84,7 @@
return *m_entry;
}
- shared_ptr<Entry>
+ const Entry*
operator->() const
{
BOOST_ASSERT(m_impl != nullptr);
@@ -113,11 +113,11 @@
/** \brief current entry; nullptr for uninitialized iterator
*/
- shared_ptr<Entry> m_entry;
+ const Entry* m_entry;
/** \brief reference entry used by enumeration implementation
*/
- shared_ptr<Entry> m_ref;
+ const Entry* m_ref;
/** \brief state used by enumeration implementation
*/
@@ -145,6 +145,7 @@
protected:
const NameTree& nt;
+ const Hashtable& ht;
};
/** \brief full enumeration implementation