Update constructor so that the call operator returns a pointer to the slot.

greg7mdp · greg7mdp · commit 1c8a6e4ab52a · 2025-05-18T19:33:25.000-04:00
diff --git a/include/gtl/phmap.hpp b/include/gtl/phmap.hpp
@@ -2143,11 +2143,12 @@ class raw_hash_set {
             return *slot_;
         }
 
+        // returns a pointer to the inserted value
         template<class... Args>
-        void operator()(Args&&... args) const {
+        slot_type* operator()(Args&&... args) const {
             assert(*slot_);
             PolicyTraits::construct(alloc_, *slot_, std::forward<Args>(args)...);
-            *slot_ = nullptr;
+            return *slot_;
         }
 
     private:
@@ -2204,7 +2205,6 @@ class raw_hash_set {
     void lazy_emplace_at(size_t& idx, F&& f) {
         slot_type* slot = slots_ + idx;
         std::forward<F>(f)(constructor(&alloc_ref(), &slot));
-        assert(!slot);
     }
 
     template<class K = key_type, class F>

Original file line number	Diff line number	Diff line change
`@@ -2143,11 +2143,12 @@ class raw_hash_set {`
`2143`	`2143`	`return *slot_;`
`2144`	`2144`	`}`
`2145`	`2145`
	`2146`	`+ // returns a pointer to the inserted value`
`2146`	`2147`	`template<class... Args>`
`2147`		`- void operator()(Args&&... args) const {`
	`2148`	`+ slot_type* operator()(Args&&... args) const {`
`2148`	`2149`	`assert(*slot_);`
`2149`	`2150`	`PolicyTraits::construct(alloc_, *slot_, std::forward<Args>(args)...);`
`2150`		`- *slot_ = nullptr;`
	`2151`	`+ return *slot_;`
`2151`	`2152`	`}`
`2152`	`2153`
`2153`	`2154`	`private:`
`@@ -2204,7 +2205,6 @@ class raw_hash_set {`
`2204`	`2205`	`void lazy_emplace_at(size_t& idx, F&& f) {`
`2205`	`2206`	`slot_type* slot = slots_ + idx;`
`2206`	`2207`	`std::forward<F>(f)(constructor(&alloc_ref(), &slot));`
`2207`		`- assert(!slot);`
`2208`	`2208`	`}`
`2209`	`2209`
`2210`	`2210`	`template<class K = key_type, class F>`