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/qcborstream.h | |
| 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/qcborstream.h')
| -rw-r--r-- | src/corelib/serialization/qcborstream.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/serialization/qcborstream.h b/src/corelib/serialization/qcborstream.h index 85acfd85ea..3b13a309ab 100644 --- a/src/corelib/serialization/qcborstream.h +++ b/src/corelib/serialization/qcborstream.h @@ -178,7 +178,7 @@ public: int containerDepth() const; QCborStreamReader::Type parentContainerType() const; - bool hasNext() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; + bool hasNext() const noexcept Q_DECL_PURE_FUNCTION; bool next(int maxRecursion = 10000); Type type() const { return QCborStreamReader::Type(type_); } @@ -203,7 +203,7 @@ public: bool isNull() const { return isSimpleType(QCborSimpleType::Null); } bool isUndefined() const { return isSimpleType(QCborSimpleType::Undefined); } - bool isLengthKnown() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; + bool isLengthKnown() const noexcept Q_DECL_PURE_FUNCTION; quint64 length() const; bool isContainer() const { return isMap() || isArray(); } @@ -240,7 +240,7 @@ private: StringResult<QByteArray> _readByteArray_helper(); qsizetype _currentStringChunkSize() const; - template <typename FP> FP _toFloatingPoint() const Q_DECL_NOTHROW + template <typename FP> FP _toFloatingPoint() const noexcept { using UInt = typename QIntegerForSizeof<FP>::Unsigned; UInt u = UInt(value64); |