commit ed1e99daa08642822cb722136294724ec5a9cf26
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Nov 05 09:59:35 2016 -0600
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Nov 05 10:01:57 2016 -0600
tree ed4c9662a086652dc60f07cb95a9a649ac95b248
parent a3973e0c8a27991b3a53c361748c87afc38f0a9d

util: Allow customization of the logger

The customization is necessary for Android and NS-3 builds

Change-Id: I8f799bfae63bd97c566eade812c575a7397ae223

src/util/logger.hpp

diff --git a/src/util/logger.hpp b/src/util/logger.hpp
index 4f0c35b..e9efba9 100644
--- a/src/util/logger.hpp
+++ b/src/util/logger.hpp
@@ -24,6 +24,10 @@
 
 #include "../common.hpp"
 
+#ifdef HAVE_NDN_CXX_CUSTOM_LOGGER
+#include "ndn-cxx-custom-logger.hpp"
+#else
+
 #include <boost/log/common.hpp>
 #include <boost/log/sources/logger.hpp>
 #include <atomic>
@@ -164,4 +168,6 @@
 } // namespace util
 } // namespace ndn
 
+#endif // HAVE_NDN_CXX_CUSTOM_LOGGER
+
 #endif // NDN_UTIL_LOGGER_HPP

src/util/logging.hpp

diff --git a/src/util/logging.hpp b/src/util/logging.hpp
index 96e1bcb..45dbe07 100644
--- a/src/util/logging.hpp
+++ b/src/util/logging.hpp
@@ -24,6 +24,10 @@
 
 #include "../common.hpp"
 
+#ifdef HAVE_NDN_CXX_CUSTOM_LOGGER
+#include "ndn-cxx-custom-logging.hpp"
+#else
+
 #include <boost/log/sinks.hpp>
 #include <mutex>
 #include <unordered_map>
@@ -184,4 +188,6 @@
 } // namespace util
 } // namespace ndn
 
+#endif // HAVE_NDN_CXX_CUSTOM_LOGGER
+
 #endif // NDN_UTIL_LOGGING_HPP