[Bf-blender-cvs] [810c88b5f13] master: Fix building without Cycles logging

[Sergey Sharybin]

Commit: 810c88b5f138af9df1096dcf64f277fc3f91b5d3
Author: Sergey Sharybin
Date:   Thu Jul 29 14:27:26 2021 +0200
Branches: master
https://developer.blender.org/rB810c88b5f138af9df1096dcf64f277fc3f91b5d3

Fix building without Cycles logging

Ideally can use assert() checks instead of suppressing the check entirely,
but for now just fix compilation error quickly.

===================================================================

M	intern/cycles/util/util_logging.cpp
M	intern/cycles/util/util_logging.h

===================================================================

diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/util_logging.cpp
index 3782187d78c..8272728a7a0 100644
--- a/intern/cycles/util/util_logging.cpp
+++ b/intern/cycles/util/util_logging.cpp
@@ -26,9 +26,9 @@
 
 CCL_NAMESPACE_BEGIN
 
+#ifdef WITH_CYCLES_LOGGING
 static bool is_verbosity_set()
 {
-#ifdef WITH_CYCLES_LOGGING
   using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
 
   std::string verbosity;
@@ -36,10 +36,8 @@ static bool is_verbosity_set()
     return false;
   }
   return verbosity != "0";
-#else
-  return false;
-#endif
 }
+#endif
 
 void util_logging_init(const char *argv0)
 {
diff --git a/intern/cycles/util/util_logging.h b/intern/cycles/util/util_logging.h
index 3e56f0a0193..c161299acd0 100644
--- a/intern/cycles/util/util_logging.h
+++ b/intern/cycles/util/util_logging.h
@@ -40,7 +40,7 @@ class LogMessageVoidify {
   LogMessageVoidify()
   {
   }
-  void operator&(StubStream &)
+  void operator&(const StubStream &)
   {
   }
 };
@@ -49,6 +49,36 @@ class LogMessageVoidify {
 #  define LOG(severity) LOG_SUPPRESS()
 #  define VLOG(severity) LOG_SUPPRESS()
 #  define VLOG_IF(severity, condition) LOG_SUPPRESS()
+
+#  define CHECK(expression) LOG_SUPPRESS()
+
+#  define CHECK_NOTNULL(expression) LOG_SUPPRESS()
+#  define CHECK_NULL(expression) LOG_SUPPRESS()
+
+#  define CHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+
+#  define CHECK_GE(a, b) LOG_SUPPRESS()
+#  define CHECK_NE(a, b) LOG_SUPPRESS()
+#  define CHECK_EQ(a, b) LOG_SUPPRESS()
+#  define CHECK_GT(a, b) LOG_SUPPRESS()
+#  define CHECK_LT(a, b) LOG_SUPPRESS()
+#  define CHECK_LE(a, b) LOG_SUPPRESS()
+
+#  define DCHECK(expression) LOG_SUPPRESS()
+
+#  define DCHECK_NOTNULL(expression) LOG_SUPPRESS()
+#  define DCHECK_NULL(expression) LOG_SUPPRESS()
+
+#  define DCHECK_NEAR(actual, expected, eps) LOG_SUPPRESS()
+
+#  define DCHECK_GE(a, b) LOG_SUPPRESS()
+#  define DCHECK_NE(a, b) LOG_SUPPRESS()
+#  define DCHECK_EQ(a, b) LOG_SUPPRESS()
+#  define DCHECK_GT(a, b) LOG_SUPPRESS()
+#  define DCHECK_LT(a, b) LOG_SUPPRESS()
+#  define DCHECK_LE(a, b) LOG_SUPPRESS()
+
+#  define LOG_ASSERT(expression) LOG_SUPPRESS()
 #endif
 
 #define VLOG_ONCE(level, flag) \