From 8e2dfce84bf5e3993a910e535a51d40ebe0803d0 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Tue, 5 May 2020 21:39:59 +0100
Subject: Require semi-colon at end of function-like macros (#4719)

---
 tests/Generating/BasicGeneratorTest.cpp |  2 +-
 tests/Generating/PieceRotationTest.cpp  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'tests/Generating')

diff --git a/tests/Generating/BasicGeneratorTest.cpp b/tests/Generating/BasicGeneratorTest.cpp
index 4b27f5344..10c66050b 100644
--- a/tests/Generating/BasicGeneratorTest.cpp
+++ b/tests/Generating/BasicGeneratorTest.cpp
@@ -186,7 +186,7 @@ static void testGenerateNether(cChunkGenerator & aDefaultNetherGen)
 				}
 				TEST_EQUAL_MSG(y, prevHeight, Printf("Failed: Same height across the entire chunk, at {%d, %d}: exp %d, got %d; top block: %d",
 					x, z, prevHeight, y, chd.GetBlockType(x, y, z)
-				))
+				));
 				auto blockType = chd.GetBlockType(x, y, z);
 				TEST_EQUAL_MSG(blockType, E_BLOCK_BEDROCK,
 					Printf("Bedrock ceiling at {%d, %d, %d}: %d", x, y, z, blockType)
diff --git a/tests/Generating/PieceRotationTest.cpp b/tests/Generating/PieceRotationTest.cpp
index ace3bd489..fff3655c1 100644
--- a/tests/Generating/PieceRotationTest.cpp
+++ b/tests/Generating/PieceRotationTest.cpp
@@ -53,11 +53,14 @@ public:
 
 
 
-#define EXPECT(X) if (!(X)) \
-	{ \
-		ASSERT(X); \
-		throw cTestFailure(#X, __FILE__, __LINE__); \
-	}
+#define EXPECT(X) \
+	do { \
+		if (!(X)) \
+		{ \
+			ASSERT(X); \
+			throw cTestFailure(#X, __FILE__, __LINE__); \
+		} \
+	} while (false)
 
 
 
-- 
cgit v1.2.3