From c24f4d2c32b475a24250ff4bed15837615f33ef0 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sat, 18 Feb 2023 09:27:26 +0800 Subject: corelib: silence `-Wcomma` with clang-12 clang-12 warns with -Wcomma warning: possible misuse of comma operator here [-Wcomma] { return Q_ASSERT(i >= 0), Q_ASSERT(i < size()), QLatin1Char(m_data[i]); } Pick-to: 6.4 6.5 Change-Id: Ice8a809c8ac9069e55aedefa71faf06385e97789 Reviewed-by: Thiago Macieira --- src/corelib/text/qlatin1stringview.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/corelib/text') diff --git a/src/corelib/text/qlatin1stringview.h b/src/corelib/text/qlatin1stringview.h index 82d3f3e7a8..c5544c8d03 100644 --- a/src/corelib/text/qlatin1stringview.h +++ b/src/corelib/text/qlatin1stringview.h @@ -78,7 +78,11 @@ public: [[nodiscard]] inline QString arg(Args &&...args) const; [[nodiscard]] constexpr QLatin1Char at(qsizetype i) const - { return Q_ASSERT(i >= 0), Q_ASSERT(i < size()), QLatin1Char(m_data[i]); } + { + Q_ASSERT(i >= 0); + Q_ASSERT(i < size()); + return QLatin1Char(m_data[i]); + } [[nodiscard]] constexpr QLatin1Char operator[](qsizetype i) const { return at(i); } [[nodiscard]] constexpr QLatin1Char front() const { return at(0); } -- cgit v1.2.3