diff options
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qhostinfo.h | 8 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_linux.cpp | 4 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qtldurl.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index 047ab3bbd9..ca2eaae2bd 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -106,12 +106,12 @@ public: typedef QtPrivate::FunctionPointer<Func> SlotType; typedef QtPrivate::FunctionPointer<void (*)(QHostInfo)> SignalType; - Q_STATIC_ASSERT_X(int(SignalType::ArgumentCount) >= int(SlotType::ArgumentCount), + static_assert(int(SignalType::ArgumentCount) >= int(SlotType::ArgumentCount), "The slot requires more arguments than the signal provides."); - Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments<typename SignalType::Arguments, + static_assert((QtPrivate::CheckCompatibleArguments<typename SignalType::Arguments, typename SlotType::Arguments>::value), "Signal and slot arguments are not compatible."); - Q_STATIC_ASSERT_X((QtPrivate::AreArgumentsCompatible<typename SlotType::ReturnType, + static_assert((QtPrivate::AreArgumentsCompatible<typename SlotType::ReturnType, typename SignalType::ReturnType>::value), "Return type of the slot is not compatible " "with the return type of the signal."); @@ -137,7 +137,7 @@ public: { typedef QtPrivate::FunctionPointer<Func1> SlotType; - Q_STATIC_ASSERT_X(int(SlotType::ArgumentCount) <= 1, + static_assert(int(SlotType::ArgumentCount) <= 1, "The slot must not require more than one argument"); auto slotObj = new QtPrivate::QFunctorSlotObject<Func1, 1, diff --git a/src/network/kernel/qnetworkinterface_linux.cpp b/src/network/kernel/qnetworkinterface_linux.cpp index 25aba5836e..a21ccf40c4 100644 --- a/src/network/kernel/qnetworkinterface_linux.cpp +++ b/src/network/kernel/qnetworkinterface_linux.cpp @@ -151,8 +151,8 @@ template <typename Lambda> struct ProcessNetlinkRequest static int expectedTypeForRequest(int rtype) { - Q_STATIC_ASSERT(RTM_NEWADDR == RTM_GETADDR - 2); - Q_STATIC_ASSERT(RTM_NEWLINK == RTM_GETLINK - 2); + static_assert(RTM_NEWADDR == RTM_GETADDR - 2); + static_assert(RTM_NEWLINK == RTM_GETLINK - 2); Q_ASSERT(rtype == RTM_GETADDR || rtype == RTM_GETLINK); return rtype - 2; } diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index a6b0886bc6..977a0dcde9 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -487,7 +487,7 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList) memset(&mediareq, 0, sizeof(mediareq)); // ensure both structs start with the name field, of size IFNAMESIZ - Q_STATIC_ASSERT(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); + static_assert(sizeof(mediareq.ifm_name) == sizeof(req.ifr_name)); Q_ASSERT(&mediareq.ifm_name == &req.ifr_name); // on NetBSD we use AF_LINK and sockaddr_dl diff --git a/src/network/kernel/qtldurl.cpp b/src/network/kernel/qtldurl.cpp index 1723acfc5b..2823a3157d 100644 --- a/src/network/kernel/qtldurl.cpp +++ b/src/network/kernel/qtldurl.cpp @@ -84,7 +84,7 @@ static bool containsTLDEntry(QStringView entry, TLDMatchType match) Q_ASSERT(tldGroupOffset <= tldIndices[index + 1]); // The last extra entry in tldIndices // should be equal to the total of all chunks' lengths. - Q_STATIC_ASSERT(tldIndices[tldCount] == tldChunks[tldChunkCount - 1]); + static_assert(tldIndices[tldCount] == tldChunks[tldChunkCount - 1]); // Find which chunk contains the tldGroupOffset while (tldGroupOffset >= tldChunks[chunk]) { |