From e0ca4d83991d80865781c1dbbbfa1f92259a366a Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Sun, 11 Aug 2019 11:39:43 +0200 Subject: Fix building with clang 8.0 (#4346) --- src/Generating/PrefabPiecePool.cpp | 10 ++++++---- src/Generating/VerticalLimit.cpp | 10 ++++++---- src/Generating/VerticalStrategy.cpp | 10 ++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) (limited to 'src/Generating') diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index ed5283dec..d984912cb 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/src/Generating/PrefabPiecePool.cpp @@ -16,10 +16,12 @@ // Conditionally log a warning #define CONDWARNING(ShouldLog, ...) \ - if (ShouldLog) \ - { \ - LOGWARNING(__VA_ARGS__); \ - } + do { \ + if (ShouldLog) \ + { \ + LOGWARNING(__VA_ARGS__); \ + } \ + } while (false) diff --git a/src/Generating/VerticalLimit.cpp b/src/Generating/VerticalLimit.cpp index 5cc003749..0d27c85bf 100644 --- a/src/Generating/VerticalLimit.cpp +++ b/src/Generating/VerticalLimit.cpp @@ -10,10 +10,12 @@ // Emit a warning if the first param is true #define CONDWARNING(ShouldLog, Fmt, ...) \ - if (ShouldLog) \ - { \ - LOGWARNING(Fmt, __VA_ARGS__); \ - } + do { \ + if (ShouldLog) \ + { \ + LOGWARNING(Fmt, __VA_ARGS__); \ + } \ + } while (false) diff --git a/src/Generating/VerticalStrategy.cpp b/src/Generating/VerticalStrategy.cpp index 4021dc4bb..fa85a05d7 100644 --- a/src/Generating/VerticalStrategy.cpp +++ b/src/Generating/VerticalStrategy.cpp @@ -20,10 +20,12 @@ static const int SEED_OFFSET = 135; // Emit a warning if the first param is true #define CONDWARNING(ShouldLog, Fmt, ...) \ - if (ShouldLog) \ - { \ - LOGWARNING(Fmt, __VA_ARGS__); \ - } + do { \ + if (ShouldLog) \ + { \ + LOGWARNING(Fmt, __VA_ARGS__); \ + } \ + } while (false) -- cgit v1.2.3