From b791e794ac4d8879fea1f8a58e97a4d2918352fd Mon Sep 17 00:00:00 2001 From: greg Date: Fri, 27 Mar 2020 19:35:00 -0400 Subject: [PATCH] rename function name which conflicts with a #define macro from /usr/include/X11/Xos.h --- parallel_hashmap/phmap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parallel_hashmap/phmap.h b/parallel_hashmap/phmap.h index 2b7ddb8..93136cf 100644 --- a/parallel_hashmap/phmap.h +++ b/parallel_hashmap/phmap.h @@ -95,7 +95,7 @@ public: offset_ &= mask_; } // 0-based probe index. The i-th probe in the probe sequence. - size_t index() const { return index_; } + size_t getindex() const { return index_; } private: size_t mask_; @@ -1908,7 +1908,7 @@ private: } if (PHMAP_PREDICT_TRUE(g.MatchEmpty())) return false; seq.next(); - assert(seq.index() < capacity_ && "full table!"); + assert(seq.getindex() < capacity_ && "full table!"); } return false; } @@ -1938,9 +1938,9 @@ private: Group g{ctrl_ + seq.offset()}; auto mask = g.MatchEmptyOrDeleted(); if (mask) { - return {seq.offset((size_t)mask.LowestBitSet()), seq.index()}; + return {seq.offset((size_t)mask.LowestBitSet()), seq.getindex()}; } - assert(seq.index() < capacity_ && "full table!"); + assert(seq.getindex() < capacity_ && "full table!"); seq.next(); } }