diff options
| -rw-r--r-- | gdb/unittests/ptid-selftests.c | 4 | ||||
| -rw-r--r-- | gdbsupport/poison.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gdb/unittests/ptid-selftests.c b/gdb/unittests/ptid-selftests.c index 5af73b0..2713b61 100644 --- a/gdb/unittests/ptid-selftests.c +++ b/gdb/unittests/ptid-selftests.c @@ -29,7 +29,9 @@ namespace ptid { This is a requirement for as long as we have ptids embedded in structures allocated with malloc. */ -static_assert (std::is_pod<ptid_t>::value, "ptid_t is POD"); +static_assert (gdb::And<std::is_standard_layout<ptid_t>, + std::is_trivial<ptid_t>>::value, + "ptid_t is POD"); /* We want to avoid implicit conversion from int to ptid_t. */ diff --git a/gdbsupport/poison.h b/gdbsupport/poison.h index 956c3d8..63fccb3 100644 --- a/gdbsupport/poison.h +++ b/gdbsupport/poison.h @@ -49,7 +49,7 @@ be a compile-time error. */ template<typename T> struct IsMemsettable : gdb::Or<std::is_void<T>, - std::is_pod<T>> + gdb::And<std::is_standard_layout<T>, std::is_trivial<T>>> {}; template <typename T, |