From 7ef7acae6fa5e97ecd612da54398a40f0422fc16 Mon Sep 17 00:00:00 2001 From: Timo Alho Date: Tue, 26 May 2020 14:11:33 +0300 Subject: [PATCH] Fix warnings on GCC -wall --- include/pcg_extras.hpp | 3 +++ include/pcg_uint128.hpp | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/pcg_extras.hpp b/include/pcg_extras.hpp index 8445ca2..41a29be 100644 --- a/include/pcg_extras.hpp +++ b/include/pcg_extras.hpp @@ -626,6 +626,9 @@ struct static_arbitrary_seed { public: static constexpr IntType value = fnv(IntType(2166136261U ^ sizeof(IntType)), __DATE__ __TIME__ __FILE__); + + //Prevent creation, while keeping GCC from giving a warning + static_arbitrary_seed() = delete; }; // Sometimes, when debugging or testing, it's handy to be able print the name diff --git a/include/pcg_uint128.hpp b/include/pcg_uint128.hpp index 9131b21..594e35e 100644 --- a/include/pcg_uint128.hpp +++ b/include/pcg_uint128.hpp @@ -101,20 +101,20 @@ namespace pcg_extras { inline bitcount_t flog2(uint32_t v) { - return 31 - __builtin_clz(v); + return bitcount_t(31 - __builtin_clz(v)); } inline bitcount_t trailingzeros(uint32_t v) { - return __builtin_ctz(v); + return bitcount_t(__builtin_ctz(v)); } inline bitcount_t flog2(uint64_t v) { #if UINT64_MAX == ULONG_MAX - return 63 - __builtin_clzl(v); + return bitcount_t(63 - __builtin_clzl(v)); #elif UINT64_MAX == ULLONG_MAX - return 63 - __builtin_clzll(v); + return bitcount_t(63 - __builtin_clzll(v)); #else #error Cannot find a function for uint64_t #endif @@ -123,9 +123,9 @@ inline bitcount_t flog2(uint64_t v) inline bitcount_t trailingzeros(uint64_t v) { #if UINT64_MAX == ULONG_MAX - return __builtin_ctzl(v); + return bitcount_t(__builtin_ctzl(v)); #elif UINT64_MAX == ULLONG_MAX - return __builtin_ctzll(v); + return bitcount_t(__builtin_ctzll(v)); #else #error Cannot find a function for uint64_t #endif