From 19a76200ea67a418fb81e3ab5201dbde2343ec03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Tue, 25 Feb 2020 10:30:08 +0100 Subject: [PATCH] QDataStream: keep brace delimiters inside #if-scopes Because it looks odd. Change-Id: Ic272ae7b1b5a3e0a70884caa683ccbdd3a61ff6a Reviewed-by: Edward Welbourne --- src/corelib/serialization/qdatastream.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 6f6593f9bf..bc05841b52 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -340,6 +340,7 @@ QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) --it; QT_WARNING_POP s << it.key() << it.value(); + } #else auto it = c.constBegin(); auto end = c.constEnd(); @@ -352,8 +353,8 @@ QDataStream &writeAssociativeContainer(QDataStream &s, const Container &c) auto next = std::next(rangeStart, i); s << next.key() << next.value(); } -#endif } +#endif return s; }