diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-19 15:29:33 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-07-20 09:00:06 +0000 |
| commit | 2b44fb5c629807ba8d22ac5a2c0f9d76bbe5b6c9 (patch) | |
| tree | 3ad9f270258aecbbe04f8643c624036a7bb5de2e /src/corelib/tools/qiterator.h | |
| parent | 7c0b706488b0edcc2fd6db7870db700ff0548f21 (diff) | |
key-value iterator: Remove constexpr from equality operators
Fixes the build with MSVC2017.
Amends ae292be8690109940fdd9862321b2389a0957404.
Task-number: QTBUG-62052
Change-Id: Ibb55e4e93815da8077961e68525e3cb8dc6807b0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qiterator.h')
| -rw-r--r-- | src/corelib/tools/qiterator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 9550c302bb..918b124d5c 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -197,8 +197,8 @@ public: return std::pair<Key, T>(i.key(), i.value()); } - friend Q_DECL_CONSTEXPR bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i == rhs.i; } - friend Q_DECL_CONSTEXPR bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i != rhs.i; } + friend bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i == rhs.i; } + friend bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i != rhs.i; } inline QKeyValueIterator &operator++() { ++i; return *this; } inline QKeyValueIterator operator++(int) { return QKeyValueIterator(i++);} |