Commit b6ef4425 authored by Dominik Charousset's avatar Dominik Charousset

fixed compilation in debug mode

parent b1bb7832
...@@ -143,14 +143,14 @@ class logging { ...@@ -143,14 +143,14 @@ class logging {
#define CPPA_DO_LOG_FUN(level, message) { \ #define CPPA_DO_LOG_FUN(level, message) { \
std::ostringstream scoped_oss; scoped_oss << message; \ std::ostringstream scoped_oss; scoped_oss << message; \
::cppa::detail::logging::instance()->log( \ ::cppa::logging::instance()->log( \
level, "NONE", \ level, "NONE", \
__FUNCTION__, __FILE__, __LINE__, scoped_oss.str()); \ __FUNCTION__, __FILE__, __LINE__, scoped_oss.str()); \
} CPPA_VOID_STMT } CPPA_VOID_STMT
#define CPPA_DO_LOG_MEMBER_FUN(level, message) { \ #define CPPA_DO_LOG_MEMBER_FUN(level, message) { \
std::ostringstream scoped_oss; scoped_oss << message; \ std::ostringstream scoped_oss; scoped_oss << message; \
::cppa::detail::logging::instance()->log( \ ::cppa::logging::instance()->log( \
level, ::cppa::detail::demangle(typeid(*this)).c_str(), \ level, ::cppa::detail::demangle(typeid(*this)).c_str(), \
__FUNCTION__, __FILE__, __LINE__, scoped_oss.str()); \ __FUNCTION__, __FILE__, __LINE__, scoped_oss.str()); \
} CPPA_VOID_STMT } CPPA_VOID_STMT
...@@ -192,7 +192,7 @@ class logging { ...@@ -192,7 +192,7 @@ class logging {
# define CPPA_LOG_TRACE(message) \ # define CPPA_LOG_TRACE(message) \
::std::ostringstream CPPA_CONCATL(cppa_trace_helper_) ; \ ::std::ostringstream CPPA_CONCATL(cppa_trace_helper_) ; \
CPPA_CONCATL(cppa_trace_helper_) << message ; \ CPPA_CONCATL(cppa_trace_helper_) << message ; \
::cppa::detail::logging::trace_helper CPPA_CONCATL(cppa_fun_trace_helper_) \ ::cppa::logging::trace_helper CPPA_CONCATL(cppa_fun_trace_helper_) \
CPPA_LPAREN ::cppa::detail::demangle \ CPPA_LPAREN ::cppa::detail::demangle \
CPPA_LPAREN typeid CPPA_LPAREN decltype CPPA_LPAREN *this \ CPPA_LPAREN typeid CPPA_LPAREN decltype CPPA_LPAREN *this \
CPPA_RPAREN CPPA_RPAREN CPPA_RPAREN , \ CPPA_RPAREN CPPA_RPAREN CPPA_RPAREN , \
...@@ -201,7 +201,7 @@ class logging { ...@@ -201,7 +201,7 @@ class logging {
# define CPPA_LOGF_TRACE(message) \ # define CPPA_LOGF_TRACE(message) \
::std::ostringstream CPPA_CONCATL(cppa_trace_helper_) ; \ ::std::ostringstream CPPA_CONCATL(cppa_trace_helper_) ; \
CPPA_CONCATL(cppa_trace_helper_) << message ; \ CPPA_CONCATL(cppa_trace_helper_) << message ; \
::cppa::detail::logging::trace_helper CPPA_CONCATL(cppa_fun_trace_helper_) \ ::cppa::logging::trace_helper CPPA_CONCATL(cppa_fun_trace_helper_) \
CPPA_LPAREN "NONE" , \ CPPA_LPAREN "NONE" , \
__func__ , __FILE__ , __LINE__ , \ __func__ , __FILE__ , __LINE__ , \
CPPA_CONCATL(cppa_trace_helper_) .str() CPPA_RPAREN CPPA_CONCATL(cppa_trace_helper_) .str() CPPA_RPAREN
......
...@@ -265,7 +265,7 @@ void default_peer::deliver(const message_header& hdr, any_tuple msg) { ...@@ -265,7 +265,7 @@ void default_peer::deliver(const message_header& hdr, any_tuple msg) {
} }
else { else {
CPPA_LOG_DEBUG("async message with " CPPA_LOG_DEBUG("async message with "
<< (msg.sender() ? "" : "in") << (hdr.sender ? "" : "in")
<< "valid sender"); << "valid sender");
receiver->enqueue(hdr.sender.get(), move(msg)); receiver->enqueue(hdr.sender.get(), move(msg));
} }
...@@ -350,7 +350,7 @@ void default_peer::enqueue(const message_header& hdr, const any_tuple& msg) { ...@@ -350,7 +350,7 @@ void default_peer::enqueue(const message_header& hdr, const any_tuple& msg) {
<< endl; << endl;
return; return;
} }
CPPA_LOG_DEBUG("serialized: " << to_string(msg.content())); CPPA_LOG_DEBUG("serialized: " << to_string(msg));
size = (m_wr_buf.size() - before) - sizeof(std::uint32_t); size = (m_wr_buf.size() - before) - sizeof(std::uint32_t);
// update size in buffer // update size in buffer
memcpy(m_wr_buf.data() + before, &size, sizeof(std::uint32_t)); memcpy(m_wr_buf.data() + before, &size, sizeof(std::uint32_t));
......
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