Merge branch 'master' into mmap

This commit is contained in:
debugman
2019-08-25 20:09:01 +08:00
committed by GitHub
3 changed files with 2 additions and 4 deletions
+1 -2
View File
@@ -2329,7 +2329,7 @@ class parallel_hash_set
KeyArg<IsTransparent<Eq>::value && IsTransparent<Hash>::value>;
static_assert(N <= 12, "N = 12 means 4096 hash tables!");
constexpr static size_t num_tables = 1 << N;
constexpr static size_t num_tables = 1 N;
constexpr static size_t mask = num_tables - 1;
public:
@@ -3162,7 +3162,6 @@ public:
template<typename InputArchive>
bool mmap_load(InputArchive& ar);
private:
template <class Container, typename Enabler>
friend struct phmap::container_internal::hashtable_debug_internal::HashtableDebugAccess;