Improve EAT_STREAM_PARAMETERS for Windows x86

base/logging.h

Index: base/logging.h
diff --git a/base/logging.h b/base/logging.h
index ce87a5351f7877245f673fb1b255986be95a5bda..6d87875751c108721849ceb9f3e0db3edb2c7d94 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -426,9 +426,11 @@ const LogSeverity LOG_0 = LOG_ERROR;
 #define PLOG_IF(severity, condition) \
   LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity) && (condition))
 
-// The actual stream used isn't important.
-#define EAT_STREAM_PARAMETERS                                           \
-  true ? (void) 0 : ::logging::LogMessageVoidify() & LOG_STREAM(FATAL)
+extern std::ostream* g_swallow_stream;
+
+#define EAT_STREAM_PARAMETERS \

[dcheng, 2016/12/09 23:16:48]

Can we add a comment that mentions the subtleties involved here? I'm going to do
some language lawyering in the meantime to make sure this is considered OK.

[scottmg, 2016/12/09 23:30:26]

Sure. Are you concerned about not actually assigning to the pointer in the .cc
file? We could also easily do that to be safe if you think that's a good idea.

+  true ? (void)0              \
+       : ::logging::LogMessageVoidify() & (*::logging::g_swallow_stream)
 
 // Captures the result of a CHECK_EQ (for example) and facilitates testing as a
 // boolean.