1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDataStream: remove pointless guard around std::pair operators

Browse Source 
The code is already in 'ifndef QT_NO_DATASTREAM'. Well, the condition
is a bit more complicated, which makes this nested guard even more
wrong.

Amends 55150f0f0bac0a6343da60d8128fc4216b57db2b.

Change-Id: I1c8f35ebc0355185244c8bf098d000b7c5c543d5
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2021-11-03 22:48:56 +01:00
parent c1c15abc8d
commit 404a7c0094
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/serialization/qdatastream.h
View File

@ -509,7 +509,6 @@ inline QDataStreamIfHasOStreamOperatorsContainer<QMultiMap<Key, T>, Key, T> oper
return QtPrivate::writeAssociativeMultiContainer(s, map); return QtPrivate::writeAssociativeMultiContainer(s, map);
} }
#ifndef QT_NO_DATASTREAM
template <class T1, class T2> template <class T1, class T2>
inline QDataStreamIfHasIStreamOperators<T1, T2> operator>>(QDataStream& s, std::pair<T1, T2> &p) inline QDataStreamIfHasIStreamOperators<T1, T2> operator>>(QDataStream& s, std::pair<T1, T2> &p)
{ {
@ -523,7 +522,6 @@ inline QDataStreamIfHasOStreamOperators<T1, T2> operator<<(QDataStream& s, const
s << p.first << p.second; s << p.first << p.second;
return s; return s;
} }
#endif
#else #else