From 404a7c00943ffaf3175744570f46441fa0d99b8b Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 3 Nov 2021 22:48:56 +0100
Subject: [PATCH] QDataStream: remove pointless guard around std::pair
 operators
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/serialization/qdatastream.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index a21cf4ebbfb..a673bfab82a 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -509,7 +509,6 @@ inline QDataStreamIfHasOStreamOperatorsContainer<QMultiMap<Key, T>, Key, T> oper
     return QtPrivate::writeAssociativeMultiContainer(s, map);
 }
 
-#ifndef QT_NO_DATASTREAM
 template <class T1, class T2>
 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;
     return s;
 }
-#endif
 
 #else