Accommodate MSVC's noncompliant preprocessor

039a2f6a · Gordon McShane · Harris Hancock · c05fb412 · 039a2f6a
Commit 039a2f6a authored Apr 01, 2016 by Gordon McShane Committed by Harris Hancock Apr 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

test.h c++/src/kj/test.h +3 -2

No files found.
--- a/c++/src/kj/test.h
+++ b/c++/src/kj/test.h
@@ -62,10 +62,11 @@ private:
  void KJ_UNIQUE_NAME(TestCase)::run()

 #if _MSC_VER
+#define KJ_INDIRECT_EXPAND(m, vargs) m vargs
 #define KJ_FAIL_EXPECT(...) \
-  KJ_EXPAND(KJ_LOG(ERROR, __VA_ARGS__));
+  KJ_INDIRECT_EXPAND(KJ_LOG, (ERROR , __VA_ARGS__));
 #define KJ_EXPECT(cond, ...) \
-  if (cond); else KJ_EXPAND(KJ_FAIL_EXPECT("failed: expected " #cond, __VA_ARGS__))
+  if (cond); else KJ_INDIRECT_EXPAND(KJ_FAIL_EXPECT, ("failed: expected " #cond , __VA_ARGS__))
 #else
 #define KJ_FAIL_EXPECT(...) \
  KJ_LOG(ERROR, ##__VA_ARGS__);