diff --git a/cmake/CMakeLists.txt.in b/cmake/CMakeLists.txt.in index d60a33e..6aba5eb 100644 --- a/cmake/CMakeLists.txt.in +++ b/cmake/CMakeLists.txt.in @@ -5,7 +5,7 @@ project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master + GIT_TAG release-1.8.1 SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" CONFIGURE_COMMAND "" diff --git a/examples/insert_bench.cc b/examples/insert_bench.cc index af75b35..b01b982 100644 --- a/examples/insert_bench.cc +++ b/examples/insert_bench.cc @@ -20,11 +20,11 @@ public: sfc64(sfc64&&) = default; sfc64& operator=(sfc64&&) = default; - sfc64(std::array const& state) - : m_a(state[0]) - , m_b(state[1]) - , m_c(state[2]) - , m_counter(state[3]) {} + sfc64(std::array const& _state) + : m_a(_state[0]) + , m_b(_state[1]) + , m_c(_state[2]) + , m_counter(_state[3]) {} static constexpr uint64_t(min)() { return (std::numeric_limits::min)(); @@ -36,10 +36,10 @@ public: sfc64() : sfc64(UINT64_C(0x853c49e6748fea9b)) {} - sfc64(uint64_t seed) - : m_a(seed) - , m_b(seed) - , m_c(seed) + sfc64(uint64_t _seed) + : m_a(_seed) + , m_b(_seed) + , m_c(_seed) , m_counter(1) { for (int i = 0; i < 12; ++i) { operator()(); diff --git a/parallel_hashmap/phmap.h b/parallel_hashmap/phmap.h index 761f8b2..a5abdb4 100644 --- a/parallel_hashmap/phmap.h +++ b/parallel_hashmap/phmap.h @@ -3184,8 +3184,8 @@ public: } float load_factor() const { - size_t capacity = bucket_count(); - return capacity ? static_cast(static_cast(size()) / capacity) : 0; + size_t _capacity = bucket_count(); + return _capacity ? static_cast(static_cast(size()) / _capacity) : 0; } float max_load_factor() const { return 1.0f; }