summaryrefslogtreecommitdiffstats
path: root/src/corelib/text
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2023-01-24 15:24:56 +0800
committerSze Howe Koh <szehowe.koh@gmail.com>2023-02-02 21:53:25 +0800
commit4bfdf6a3d156184579e9fc66224754a6e66159dd (patch)
treeec56bcdd78b065bad70e5b48acc480ab362129ef /src/corelib/text
parentc307cbea90a885b3981d0d7d661e19084c6134d2 (diff)
QAnyStringView: fix MSVC warning C4702
The previous fix attempt at 8ba8d1346a562347c398bdd0529d34f94f2ac698 does not work when C++20 mode is enabled. MSVC optimizes away the "else" block but triggers warning C4702 on "return true". Moving the return line into the "else" block ensures that it is optimized away too. Change-Id: I9ef02cd3631ff78091530b6fb2b91c2eddcbab5d Pick-to: 6.5 6.4 Fixes: QTBUG-104836 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Yuhang Zhao <yuhangzhao@deepin.org>
Diffstat (limited to 'src/corelib/text')
-rw-r--r--src/corelib/text/qanystringview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h
index 6bf301cfd2..4be8910cf6 100644
--- a/src/corelib/text/qanystringview.h
+++ b/src/corelib/text/qanystringview.h
@@ -122,8 +122,8 @@ private:
if (uchar(str[i]) > 0x7f)
return false;
}
+ return true;
}
- return true;
#endif
}