Commit 05d2dcf3 authored by Dominik Charousset's avatar Dominik Charousset

Fix "undefined macro" warnings

parent 294b247b
...@@ -200,7 +200,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; } ...@@ -200,7 +200,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
#define CAF_PRINT_IF1(stmt, lvlname, classname, funname, msg) \ #define CAF_PRINT_IF1(stmt, lvlname, classname, funname, msg) \
CAF_PRINT_IF0(stmt, lvlname, classname, funname, msg) CAF_PRINT_IF0(stmt, lvlname, classname, funname, msg)
#if CAF_LOG_LEVEL < CAF_TRACE #if !defined(CAF_LOG_LEVEL) || CAF_LOG_LEVEL < CAF_TRACE
#define CAF_PRINT4(arg0, arg1, arg2, arg3) #define CAF_PRINT4(arg0, arg1, arg2, arg3)
#else #else
#define CAF_PRINT4(lvlname, classname, funname, msg) \ #define CAF_PRINT4(lvlname, classname, funname, msg) \
...@@ -210,7 +210,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; } ...@@ -210,7 +210,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
} }
#endif #endif
#if CAF_LOG_LEVEL < CAF_DEBUG #if !defined(CAF_LOG_LEVEL) || CAF_LOG_LEVEL < CAF_DEBUG
#define CAF_PRINT3(arg0, arg1, arg2, arg3) #define CAF_PRINT3(arg0, arg1, arg2, arg3)
#define CAF_PRINT_IF3(arg0, arg1, arg2, arg3, arg4) #define CAF_PRINT_IF3(arg0, arg1, arg2, arg3, arg4)
#else #else
...@@ -220,7 +220,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; } ...@@ -220,7 +220,7 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
CAF_PRINT_IF0(stmt, lvlname, classname, funname, msg) CAF_PRINT_IF0(stmt, lvlname, classname, funname, msg)
#endif #endif
#if CAF_LOG_LEVEL < CAF_INFO #if !defined(CAF_LOG_LEVEL) || CAF_LOG_LEVEL < CAF_INFO
#define CAF_PRINT2(arg0, arg1, arg2, arg3) #define CAF_PRINT2(arg0, arg1, arg2, arg3)
#define CAF_PRINT_IF2(arg0, arg1, arg2, arg3, arg4) #define CAF_PRINT_IF2(arg0, arg1, arg2, arg3, arg4)
#else #else
......
...@@ -91,7 +91,7 @@ uint32_t actor_registry::next_id() { ...@@ -91,7 +91,7 @@ uint32_t actor_registry::next_id() {
} }
void actor_registry::inc_running() { void actor_registry::inc_running() {
# if CAF_LOG_LEVEL >= CAF_DEBUG # if defined(CAF_LOG_LEVEL) && CAF_LOG_LEVEL >= CAF_DEBUG
CAF_LOG_DEBUG("new value = " << ++m_running); CAF_LOG_DEBUG("new value = " << ++m_running);
# else # else
++m_running; ++m_running;
......
...@@ -42,7 +42,7 @@ void caf_unexpected_timeout(const char* file, size_t line); ...@@ -42,7 +42,7 @@ void caf_unexpected_timeout(const char* file, size_t line);
#define CAF_PRINT(message) CAF_PRINTC(__FILE__, __LINE__, message) #define CAF_PRINT(message) CAF_PRINTC(__FILE__, __LINE__, message)
#if CAF_LOG_LEVEL > 1 #if defined(CAF_LOG_LEVEL) && CAF_LOG_LEVEL > 1
#define CAF_PRINTERRC(fname, linenum, msg) \ #define CAF_PRINTERRC(fname, linenum, msg) \
CAF_LOGF_ERROR(CAF_STREAMIFY(fname, linenum, msg)); \ CAF_LOGF_ERROR(CAF_STREAMIFY(fname, linenum, msg)); \
std::cerr << "ERROR: " << CAF_STREAMIFY(fname, linenum, msg) << std::endl std::cerr << "ERROR: " << CAF_STREAMIFY(fname, linenum, msg) << std::endl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment