Wrap KJ_LOG in braces

This fixes "dangling else" warnings when KJ_LOG is used after unbraced if statement.

Wrap KJ_LOG in braces
This fixes "dangling else" warnings when KJ_LOG is used after unbraced if statement.
6de0e9b5 · Oleg Kolosov · ab359776 · 6de0e9b5
Commit 6de0e9b5 authored Aug 30, 2018 by Oleg Kolosov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

debug.h c++/src/kj/debug.h +4 -4

No files found.
--- a/c++/src/kj/debug.h
+++ b/c++/src/kj/debug.h
@@ -131,9 +131,9 @@ namespace kj {
 #define KJ_EXPAND(X) X

 #define KJ_LOG(severity, ...) \
-  if (!::kj::_::Debug::shouldLog(::kj::LogSeverity::severity)) {} else \
+{ if (!::kj::_::Debug::shouldLog(::kj::LogSeverity::severity)) {} else \
    ::kj::_::Debug::log(__FILE__, __LINE__, ::kj::LogSeverity::severity, \
-                        "" #__VA_ARGS__, __VA_ARGS__)
+                        "" #__VA_ARGS__, __VA_ARGS__); }

 #define KJ_DBG(...) KJ_EXPAND(KJ_LOG(DBG, __VA_ARGS__))

@@ -210,9 +210,9 @@ namespace kj {
 #else

 #define KJ_LOG(severity, ...) \
-  if (!::kj::_::Debug::shouldLog(::kj::LogSeverity::severity)) {} else \
+{ if (!::kj::_::Debug::shouldLog(::kj::LogSeverity::severity)) {} else \
    ::kj::_::Debug::log(__FILE__, __LINE__, ::kj::LogSeverity::severity, \
-                        #__VA_ARGS__, ##__VA_ARGS__)
+                        #__VA_ARGS__, ##__VA_ARGS__); }

 #define KJ_DBG(...) KJ_LOG(DBG, ##__VA_ARGS__)