From 34ae919f23b7d89844358afea23c73dc6469faf3 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Wed, 3 Jun 2020 15:26:15 +0200 Subject: Enforce two's complement integers C++20 will make this true for everyone, but as far as Qt goes, this has to apply to all platforms even before that. Just add another couple of checks to the list. Change-Id: I0251ce431d4584380cfd3fc3e4b36f1dbdbf9df2 Pick-to: 5.15 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 2b2a03cc76..798e445ee4 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -145,6 +145,10 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in Q_STATIC_ASSERT_X(sizeof(float) == 4, "Qt assumes that float is 32 bits"); Q_STATIC_ASSERT_X(sizeof(char16_t) == 2, "Qt assumes that char16_t is 16 bits"); Q_STATIC_ASSERT_X(sizeof(char32_t) == 4, "Qt assumes that char32_t is 32 bits"); +Q_STATIC_ASSERT_X(std::numeric_limits::radix == 2, + "Qt assumes binary integers"); +Q_STATIC_ASSERT_X((std::numeric_limits::max() + std::numeric_limits::lowest()) == -1, + "Qt assumes two's complement integers"); // While we'd like to check for __STDC_IEC_559__, as per ISO/IEC 9899:2011 // Annex F (C11, normative for C++11), there are a few corner cases regarding -- cgit v1.2.3