foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Merge #20491: refactor: Drop noop gcc version checks

Browse source 
830ddf4139 Drop noop gcc version checks (Hennadii Stepanov)

Pull request description:

  Since #20413 the minimum required GCC version is 7.

ACKs for top commit:
  fanquake:
    ACK 830ddf4139

Tree-SHA512: 36264661d6ced1683a0c907efba7c700502acaf8e9fd50d9066bc9c7b877b25165b0684c2d7fe74bd58e500a77d7702bdbdd53691c274f29e4abccd241c10964
This commit is contained in:
fanquake 2020-11-30 15:45:37 +08:00
commit 817aeca57a
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bench/prevector.cpp
View file

@ -9,24 +9,16 @@
#include <bench/bench.h> #include <bench/bench.h>
// GCC 4.8 is missing some C++11 type_traits,
// https://www.gnu.org/software/gcc/gcc-5/changes.html
#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
#define IS_TRIVIALLY_CONSTRUCTIBLE std::has_trivial_default_constructor
#else
#define IS_TRIVIALLY_CONSTRUCTIBLE std::is_trivially_default_constructible
#endif
struct nontrivial_t { struct nontrivial_t {
int x; int x;
nontrivial_t() :x(-1) {} nontrivial_t() :x(-1) {}
SERIALIZE_METHODS(nontrivial_t, obj) { READWRITE(obj.x); } SERIALIZE_METHODS(nontrivial_t, obj) { READWRITE(obj.x); }
}; };
static_assert(!IS_TRIVIALLY_CONSTRUCTIBLE<nontrivial_t>::value, static_assert(!std::is_trivially_default_constructible<nontrivial_t>::value,
"expected nontrivial_t to not be trivially constructible"); "expected nontrivial_t to not be trivially constructible");
typedef unsigned char trivial_t; typedef unsigned char trivial_t;
static_assert(IS_TRIVIALLY_CONSTRUCTIBLE<trivial_t>::value, static_assert(std::is_trivially_default_constructible<trivial_t>::value,
"expected trivial_t to be trivially constructible"); "expected trivial_t to be trivially constructible");
template <typename T> template <typename T>

2
src/test/fuzz/addition_overflow.cpp
View file

@ -14,7 +14,7 @@
#if __has_builtin(__builtin_add_overflow) #if __has_builtin(__builtin_add_overflow)
#define HAVE_BUILTIN_ADD_OVERFLOW #define HAVE_BUILTIN_ADD_OVERFLOW
#endif #endif
#elif defined(__GNUC__) && (__GNUC__ >= 5) #elif defined(__GNUC__)
#define HAVE_BUILTIN_ADD_OVERFLOW #define HAVE_BUILTIN_ADD_OVERFLOW
#endif #endif

2
src/test/fuzz/multiplication_overflow.cpp
View file

@ -14,7 +14,7 @@
#if __has_builtin(__builtin_mul_overflow) #if __has_builtin(__builtin_mul_overflow)
#define HAVE_BUILTIN_MUL_OVERFLOW #define HAVE_BUILTIN_MUL_OVERFLOW
#endif #endif
#elif defined(__GNUC__) && (__GNUC__ >= 5) #elif defined(__GNUC__)
#define HAVE_BUILTIN_MUL_OVERFLOW #define HAVE_BUILTIN_MUL_OVERFLOW
#endif #endif