fix couple warnings, use stable version ofg googletest

This commit is contained in:
greg
2021-02-01 21:38:52 -05:00
parent 9f6f49a965
commit 118e56fb7f
3 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ project(googletest-download NONE)
include(ExternalProject) include(ExternalProject)
ExternalProject_Add(googletest ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG master GIT_TAG release-1.8.1
SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build"
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
+9 -9
View File
@@ -20,11 +20,11 @@ public:
sfc64(sfc64&&) = default; sfc64(sfc64&&) = default;
sfc64& operator=(sfc64&&) = default; sfc64& operator=(sfc64&&) = default;
sfc64(std::array<uint64_t, 4> const& state) sfc64(std::array<uint64_t, 4> const& _state)
: m_a(state[0]) : m_a(_state[0])
, m_b(state[1]) , m_b(_state[1])
, m_c(state[2]) , m_c(_state[2])
, m_counter(state[3]) {} , m_counter(_state[3]) {}
static constexpr uint64_t(min)() { static constexpr uint64_t(min)() {
return (std::numeric_limits<uint64_t>::min)(); return (std::numeric_limits<uint64_t>::min)();
@@ -36,10 +36,10 @@ public:
sfc64() sfc64()
: sfc64(UINT64_C(0x853c49e6748fea9b)) {} : sfc64(UINT64_C(0x853c49e6748fea9b)) {}
sfc64(uint64_t seed) sfc64(uint64_t _seed)
: m_a(seed) : m_a(_seed)
, m_b(seed) , m_b(_seed)
, m_c(seed) , m_c(_seed)
, m_counter(1) { , m_counter(1) {
for (int i = 0; i < 12; ++i) { for (int i = 0; i < 12; ++i) {
operator()(); operator()();
+2 -2
View File
@@ -3184,8 +3184,8 @@ public:
} }
float load_factor() const { float load_factor() const {
size_t capacity = bucket_count(); size_t _capacity = bucket_count();
return capacity ? static_cast<float>(static_cast<double>(size()) / capacity) : 0; return _capacity ? static_cast<float>(static_cast<double>(size()) / _capacity) : 0;
} }
float max_load_factor() const { return 1.0f; } float max_load_factor() const { return 1.0f; }