diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 14:14:02 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-14 15:52:58 +0200 |
commit | 6f0df02d002356625f10683ef84da7685d92a2c4 (patch) | |
tree | 46713209af459ebda534c3404f48c5f5c80ba3f8 /src/corelib/serialization/qcborarray.h | |
parent | 44cce1a2ea9dadd8b2de93f40de34269dda703c0 (diff) |
Replace Qt CONSTEXPR defines with constexpr
Both normal and relaxed constexpr are required by our new minimum of
C++17.
Change-Id: Ic028b88a2e7a6cb7d5925f3133b9d54859a81744
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/serialization/qcborarray.h')
-rw-r--r-- | src/corelib/serialization/qcborarray.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index 4ad8100bfe..ba7f4dc80d 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -68,8 +68,8 @@ public: typedef QCborValueRef reference; typedef QCborValueRef *pointer; - Q_DECL_CONSTEXPR Iterator() = default; - Q_DECL_CONSTEXPR Iterator(const Iterator &) = default; + constexpr Iterator() = default; + constexpr Iterator(const Iterator &) = default; Iterator &operator=(const Iterator &other) { // rebind the reference @@ -117,8 +117,8 @@ public: typedef const QCborValueRef reference; typedef const QCborValueRef *pointer; - Q_DECL_CONSTEXPR ConstIterator() = default; - Q_DECL_CONSTEXPR ConstIterator(const ConstIterator &) = default; + constexpr ConstIterator() = default; + constexpr ConstIterator(const ConstIterator &) = default; ConstIterator &operator=(const ConstIterator &other) { // rebind the reference |