Update style to (almost) conform to ndn-cxx style using clang-format
diff --git a/src/logging.hpp b/src/logging.hpp
index 68a8762..211601f 100644
--- a/src/logging.hpp
+++ b/src/logging.hpp
@@ -27,38 +27,36 @@
#include <log4cxx/logger.h>
-#define MEMBER_LOGGER \
- static log4cxx::LoggerPtr staticModuleLogger;
+#define MEMBER_LOGGER static log4cxx::LoggerPtr staticModuleLogger;
-#define INIT_MEMBER_LOGGER(className,name) \
- log4cxx::LoggerPtr className::staticModuleLogger = log4cxx::Logger::getLogger (name);
+#define INIT_MEMBER_LOGGER(className, name) \
+ log4cxx::LoggerPtr className::staticModuleLogger = log4cxx::Logger::getLogger(name);
#define INIT_LOGGER(name) \
- static log4cxx::LoggerPtr staticModuleLogger = log4cxx::Logger::getLogger (name);
+ static log4cxx::LoggerPtr staticModuleLogger = log4cxx::Logger::getLogger(name);
-#define _LOG_DEBUG(x) \
- LOG4CXX_DEBUG(staticModuleLogger, x);
+#define _LOG_DEBUG(x) LOG4CXX_DEBUG(staticModuleLogger, x);
-#define _LOG_TRACE(x) \
- LOG4CXX_TRACE(staticModuleLogger, x);
+#define _LOG_TRACE(x) LOG4CXX_TRACE(staticModuleLogger, x);
-#define _LOG_FUNCTION(x) \
- LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "(" << x << ")");
+#define _LOG_FUNCTION(x) LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "(" << x << ")");
-#define _LOG_FUNCTION_NOARGS \
- LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "()");
+#define _LOG_FUNCTION_NOARGS LOG4CXX_TRACE(staticModuleLogger, __FUNCTION__ << "()");
-#define _LOG_ERROR(x) \
- LOG4CXX_ERROR(staticModuleLogger, x);
+#define _LOG_ERROR(x) LOG4CXX_ERROR(staticModuleLogger, x);
-#define _LOG_ERROR_COND(cond,x) \
- if (cond) { _LOG_ERROR(x) }
+#define _LOG_ERROR_COND(cond, x) \
+ if (cond) { \
+ _LOG_ERROR(x) \
+ }
-#define _LOG_DEBUG_COND(cond,x) \
- if (cond) { _LOG_DEBUG(x) }
+#define _LOG_DEBUG_COND(cond, x) \
+ if (cond) { \
+ _LOG_DEBUG(x) \
+ }
void
-INIT_LOGGERS ();
+INIT_LOGGERS();
#else // else HAVE_LOG4CXX
@@ -68,20 +66,21 @@
#define _LOG_TRACE(x)
#define INIT_LOGGERS(x)
#define _LOG_ERROR(x)
-#define _LOG_ERROR_COND(cond,x)
-#define _LOG_DEBUG_COND(cond,x)
+#define _LOG_ERROR_COND(cond, x)
+#define _LOG_DEBUG_COND(cond, x)
#define MEMBER_LOGGER
-#define INIT_MEMBER_LOGGER(className,name)
+#define INIT_MEMBER_LOGGER(className, name)
#ifdef _DEBUG
-#include <boost/thread/thread.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread/thread.hpp>
#include <iostream>
-#define _LOG_DEBUG(x) \
- std::clog << boost::get_system_time () << " " << boost::this_thread::get_id () << " " << x << std::endl;
+#define _LOG_DEBUG(x) \
+ std::clog << boost::get_system_time() << " " << boost::this_thread::get_id() << " " << x \
+ << std::endl;
#else
#define _LOG_DEBUG(x)