Actual fix for issue #125

greg7mdp · Jan 31, 2022 · ed229ad · ed229ad
1 parent 7c092b7
commit ed229ad
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/parallel_hashmap/phmap.h b/parallel_hashmap/phmap.h
@@ -2460,6 +2460,20 @@ class parallel_hash_set
     // --------------------------------------------------------------------
     struct Inner : public Lockable
     {
+        struct Params
+        {
+            size_t bucket_cnt;
+            const hasher& hashfn;
+            const key_equal& eq;
+            const allocator_type& alloc;
+        };
+
+        Inner() {}
+
+        Inner(Params p) :
+            set_(p.bucket_cnt, p.hashfn, p.eq, p.alloc)
+        {}
+
         bool operator==(const Inner& o) const
         {
             typename Lockable::SharedLocks l(const_cast<Inner &>(*this), const_cast<Inner &>(o));
@@ -2637,10 +2651,15 @@ class parallel_hash_set
     explicit parallel_hash_set(size_t bucket_cnt, 
                                const hasher& hash_param    = hasher(),
                                const key_equal& eq         = key_equal(),
-                               const allocator_type& alloc = allocator_type()) {
-        for (auto& inner : sets_)
-            inner.set_ = EmbeddedSet(bucket_cnt / N, hash_param, eq, alloc);
-    }
+                               const allocator_type& alloc = allocator_type()) :
+        parallel_hash_set(Inner::Params(bucket_cnt, hash_param, eq, alloc), 
+                          phmap::make_index_sequence<num_tables>{})
+    {}
+
+    template <std::size_t... i>
+    parallel_hash_set(Inner::Params p,
+                      phmap::index_sequence<i...>) : sets_{((void)i, p)...}
+    {}
 
     parallel_hash_set(size_t bucket_cnt, 
                       const hasher& hash_param,