mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-02 09:46:52 -05:00
Merge #20491: refactor: Drop noop gcc version checks
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: ACK830ddf4139
Tree-SHA512: 36264661d6ced1683a0c907efba7c700502acaf8e9fd50d9066bc9c7b877b25165b0684c2d7fe74bd58e500a77d7702bdbdd53691c274f29e4abccd241c10964
This commit is contained in:
commit
817aeca57a
3 changed files with 4 additions and 12 deletions
|
@ -9,24 +9,16 @@
|
|||
|
||||
#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 {
|
||||
int x;
|
||||
nontrivial_t() :x(-1) {}
|
||||
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");
|
||||
|
||||
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");
|
||||
|
||||
template <typename T>
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#if __has_builtin(__builtin_add_overflow)
|
||||
#define HAVE_BUILTIN_ADD_OVERFLOW
|
||||
#endif
|
||||
#elif defined(__GNUC__) && (__GNUC__ >= 5)
|
||||
#elif defined(__GNUC__)
|
||||
#define HAVE_BUILTIN_ADD_OVERFLOW
|
||||
#endif
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#if __has_builtin(__builtin_mul_overflow)
|
||||
#define HAVE_BUILTIN_MUL_OVERFLOW
|
||||
#endif
|
||||
#elif defined(__GNUC__) && (__GNUC__ >= 5)
|
||||
#elif defined(__GNUC__)
|
||||
#define HAVE_BUILTIN_MUL_OVERFLOW
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue