From 9f1f2e3eeda08772b3614aace43b361f92dcc4bb Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Thu, 13 Jul 2023 15:34:00 +0200 Subject: [PATCH] QUuid: remove pointless inline keyword constexpr functions are implicitly inline Found during API review. Change-Id: I94daa0a67336fa99a1465115edb83e545580a78a Reviewed-by: Marc Mutz (cherry picked from commit ef4e36aa3c816d9d8d07db412e72821a75de4e40) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/plugin/quuid.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 0cead3a8b7d..b8bb5bd95ac 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -243,7 +243,7 @@ inline QUuid QUuid::fromBytes(const void *bytes, QSysInfo::Endian order) noexcep } #ifdef __SIZEOF_INT128__ -constexpr inline QUuid::QUuid(quint128 uuid, QSysInfo::Endian order) noexcept +constexpr QUuid::QUuid(quint128 uuid, QSysInfo::Endian order) noexcept : QUuid() { if (order == QSysInfo::LittleEndian) @@ -255,7 +255,7 @@ constexpr inline QUuid::QUuid(quint128 uuid, QSysInfo::Endian order) noexcept data4[i] = uchar(uuid >> (56 - i * 8)); } -constexpr inline quint128 QUuid::toUInt128(QSysInfo::Endian order) const noexcept +constexpr quint128 QUuid::toUInt128(QSysInfo::Endian order) const noexcept { quint128 result = {}; result = data1;