diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-08 19:28:09 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-14 04:20:38 +0000 |
commit | 1016c0af740ebdf4b7dccfe5db5d63f07e4fee00 (patch) | |
tree | 84d28a511ad47f7011bbfc16bf9185b244f1166c /src/corelib/serialization/qcborvalue.cpp | |
parent | 503646a3317c1041fb5ded803a3935ef330ea036 (diff) |
CBOR: Use "noexcept" directly
All supported compilers support it.
Doing this just for the new API. We should do it throughout Qt, but only
if it won't interfere with the header review.
Change-Id: Id59bdd8f1a804b809e22fffd153f9254688e5152
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/serialization/qcborvalue.cpp')
-rw-r--r-- | src/corelib/serialization/qcborvalue.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index 468a4b0780..0ec84c12d1 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -1395,12 +1395,12 @@ int QCborValue::compare(const QCborValue &other) const return compareElementRecursive(container, e1, other.container, e2); } -int QCborArray::compare(const QCborArray &other) const Q_DECL_NOTHROW +int QCborArray::compare(const QCborArray &other) const noexcept { return compareContainer(d.data(), other.d.data()); } -int QCborMap::compare(const QCborMap &other) const Q_DECL_NOTHROW +int QCborMap::compare(const QCborMap &other) const noexcept { return compareContainer(d.data(), other.d.data()); } @@ -2560,22 +2560,22 @@ void QCborValueRef::assign(QCborValueRef that, const QCborValueRef other) assign(that, other.concrete()); } -QCborValue QCborValueRef::concrete(QCborValueRef self) Q_DECL_NOTHROW +QCborValue QCborValueRef::concrete(QCborValueRef self) noexcept { return self.d->valueAt(self.i); } -QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) Q_DECL_NOTHROW +QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) noexcept { return self.d->elements.at(self.i).type; } -inline QCborArray::QCborArray(QCborContainerPrivate &dd) Q_DECL_NOTHROW +inline QCborArray::QCborArray(QCborContainerPrivate &dd) noexcept : d(&dd) { } -inline QCborMap::QCborMap(QCborContainerPrivate &dd) Q_DECL_NOTHROW +inline QCborMap::QCborMap(QCborContainerPrivate &dd) noexcept : d(&dd) { } |