1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtPrivate::ResultIteratorBase: remove incorrect noexcept

Browse Source 
The (in)equality operators cannot be noexcept, because the
QMap::const_iterator comparison is not noexcept.
QMap::const_iterator basically uses std::map::const_iterator comparison
operators, and I could not find any proof that it is noexcept.

Amends ed71387d1cc06afff42ac844a3887778685ce793.

Found in 6.8 API review.

Change-Id: I9014052588a7864b729a7b8ac703f5145675f860
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit a942a373051ddab40742f213e36fa5851c97b384)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-08-27 12:38:29 +02:00 committed by Qt Cherry-pick Bot
parent 4cef74fe76
commit 67ce24cf30
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/thread/qresultstore.h
View File

@ -56,11 +56,11 @@ public:
private: private:
friend bool comparesEqual(const ResultIteratorBase &lhs, friend bool comparesEqual(const ResultIteratorBase &lhs,
const ResultIteratorBase &rhs) noexcept const ResultIteratorBase &rhs)
{ {
return (lhs.mapIterator == rhs.mapIterator && lhs.m_vectorIndex == rhs.m_vectorIndex); return (lhs.mapIterator == rhs.mapIterator && lhs.m_vectorIndex == rhs.m_vectorIndex);
} }
Q_DECLARE_EQUALITY_COMPARABLE(ResultIteratorBase) Q_DECLARE_EQUALITY_COMPARABLE_NON_NOEXCEPT(ResultIteratorBase)
protected: protected:
QMap<int, ResultItem>::const_iterator mapIterator; QMap<int, ResultItem>::const_iterator mapIterator;
int m_vectorIndex; int m_vectorIndex;