Merge branch 'macro' into 'master'

Add namespace to macro See merge request !896

Merge branch 'macro' into 'master'
Add namespace to macro See merge request !896
aca65015 · 叶剑武 · d0036351 · d8eb2ecb · aca65015
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

mace/utils/logging.h mace/utils/logging.h +3 -2

未找到文件。
--- a/mace/utils/logging.h
+++ b/mace/utils/logging.h
@@ -71,12 +71,13 @@ class LogMessage : public std::ostringstream {
 // which are not safe for MACE_ASSERT.
 #define MACE_CHECK(condition, ...) \
  if (!(condition)) \
-  LOG(FATAL) << "Check failed: " #condition " " << MakeString(__VA_ARGS__)
+  LOG(FATAL) << "Check failed: " #condition " " << mace::MakeString(__VA_ARGS__)

 #ifndef NDEBUG
 #define MACE_ASSERT(condition, ...) \
  if (!(condition)) \
-  LOG(FATAL) << "Assert failed: " #condition " " << MakeString(__VA_ARGS__)
+  LOG(FATAL) << "Assert failed: " #condition " " \
+             << mace::MakeString(__VA_ARGS__)
 #else
 #define MACE_ASSERT(condition, ...) ((void)0)
 #endif