diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-25 10:30:08 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-03-10 09:29:12 +0100 |
| commit | 19a76200ea67a418fb81e3ab5201dbde2343ec03 (patch) | |
| tree | 7ed092656ec27fd7a361decd115015c8c21a79af /src | |
| parent | d340cc1512a9bf62d824c33c592358699593c6bb (diff) | |
QDataStream: keep brace delimiters inside #if-scopes
Because it looks odd.
Change-Id: Ic272ae7b1b5a3e0a70884caa683ccbdd3a61ff6a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |