diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-21 11:38:50 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-06-21 15:01:28 +0000 |
| commit | 64286ff96a684d9dec47988bd4c93b73d1f022bd (patch) | |
| tree | f9bb5038e47f55207c447fd8b9a7dc4c92a87030 /src/corelib/serialization | |
| parent | c44e8b25662d096f2bffa02c057104b2a1cdf7c4 (diff) | |
QDataStream: Fix inlining of operator<<,>>() for quint32
The inline operators are referenced by the container serialization
helper code above the definition, causing g++ 8.1/MinGW to complain:
In file included from ..\..\include/QtCore/qdatastream.h:1,
from access\qnetworkaccessdebugpipebackend.cpp:41:
..\..\include/QtCore/../../src/corelib/serialization/qdatastream.h:349:21: error: 'QDataStream& QDataStream::operator>>(quint32&)' redeclared without dllimport attribute after being referenced with dll linkage [-Werror]
inline QDataStream &QDataStream::operator>>(quint32 &i)
^~~~~~~~~~~
..\..\include/QtCore/../../src/corelib/serialization/qdatastream.h:361:21: error: 'QDataStream& QDataStream::operator<<(quint32)' redeclared without dllimport attribute after being referenced with dll linkage [-Werror]
inline QDataStream &QDataStream::operator<<(quint32 i)
Declare the operators to be inline to fix this.
Task-number: QTBUG-68742
Task-number: QTQAINFRA-2095
Change-Id: Ifa075aff8749df5c7a56148b8b9a0e3ec1e853aa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 1f1b13686c..1775022355 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -151,7 +151,7 @@ public: QDataStream &operator>>(qint16 &i); QDataStream &operator>>(quint16 &i); QDataStream &operator>>(qint32 &i); - QDataStream &operator>>(quint32 &i); + inline QDataStream &operator>>(quint32 &i); QDataStream &operator>>(qint64 &i); QDataStream &operator>>(quint64 &i); QDataStream &operator>>(std::nullptr_t &ptr) { ptr = nullptr; return *this; } @@ -167,7 +167,7 @@ public: QDataStream &operator<<(qint16 i); QDataStream &operator<<(quint16 i); QDataStream &operator<<(qint32 i); - QDataStream &operator<<(quint32 i); + inline QDataStream &operator<<(quint32 i); QDataStream &operator<<(qint64 i); QDataStream &operator<<(quint64 i); QDataStream &operator<<(std::nullptr_t) { return *this; } |