diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 20:43:50 +0100 |
| commit | c2f167b41284cee3570434deba85f26f14ff241f (patch) | |
| tree | b0f52f86a8df266547d7ec7afa22d0c0d68d3532 /src/corelib/serialization/qcborvalue_p.h | |
| parent | 9f9049b486a47aef0c7e2e3852b20aa4ffdce748 (diff) | |
| parent | ff922e7b87de147797fbd759167878aec7625f0c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/corelib/serialization/qcborvalue_p.h')
| -rw-r--r-- | src/corelib/serialization/qcborvalue_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index 53ba81fa18..f6d9c15841 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -115,7 +115,8 @@ struct ByteData QStringView asStringView() const{ return QStringView(utf16(), len / 2); } QString asQStringRaw() const { return QString::fromRawData(utf16(), len / 2); } }; -Q_STATIC_ASSERT(std::is_pod<ByteData>::value); +Q_STATIC_ASSERT(std::is_trivial<ByteData>::value); +Q_STATIC_ASSERT(std::is_standard_layout<ByteData>::value); } // namespace QtCbor Q_DECLARE_TYPEINFO(QtCbor::Element, Q_PRIMITIVE_TYPE); |