commit 1fe7ce585057794a72847134a69c8d77a0a599c1
author Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 08 05:48:02 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Mon Aug 08 05:48:02 2016 +0000
tree 57598117efba90a09059a028b6085b003f396d4a
parent 103d8ed2d6adb096c8e8bdd9a8c04ccf47fd3299

util: rename NDN_CXX_LOG_* macros to NDN_LOG_*

refs #3562

Change-Id: I7366d20e064d483a852c39def523644950d2f2e3

tests/unit-tests/util/log-module1.cpp

diff --git a/tests/unit-tests/util/log-module1.cpp b/tests/unit-tests/util/log-module1.cpp
index dab7577..9641ef2 100644
--- a/tests/unit-tests/util/log-module1.cpp
+++ b/tests/unit-tests/util/log-module1.cpp
@@ -18,9 +18,10 @@
  *
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
+
 #include "util/logger.hpp"
 
-NDN_CXX_LOG_INIT(Module1);
+NDN_LOG_INIT(Module1);
 
 namespace ndn {
 namespace util {
@@ -29,12 +30,12 @@
 void
 logFromModule1()
 {
-  NDN_CXX_LOG_TRACE("trace" << 1);
-  NDN_CXX_LOG_DEBUG("debug" << 1);
-  NDN_CXX_LOG_INFO("info" << 1);
-  NDN_CXX_LOG_WARN("warn" << 1);
-  NDN_CXX_LOG_ERROR("error" << 1);
-  NDN_CXX_LOG_FATAL("fatal" << 1);
+  NDN_LOG_TRACE("trace" << 1);
+  NDN_LOG_DEBUG("debug" << 1);
+  NDN_LOG_INFO("info" << 1);
+  NDN_LOG_WARN("warn" << 1);
+  NDN_LOG_ERROR("error" << 1);
+  NDN_LOG_FATAL("fatal" << 1);
 }
 
 } // namespace tests

tests/unit-tests/util/log-module2.cpp

diff --git a/tests/unit-tests/util/log-module2.cpp b/tests/unit-tests/util/log-module2.cpp
index 550aa53..37e86d0 100644
--- a/tests/unit-tests/util/log-module2.cpp
+++ b/tests/unit-tests/util/log-module2.cpp
@@ -18,9 +18,10 @@
  *
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
+
 #include "util/logger.hpp"
 
-NDN_CXX_LOG_INIT(Module2);
+NDN_LOG_INIT(Module2);
 
 namespace ndn {
 namespace util {
@@ -29,12 +30,12 @@
 void
 logFromModule2()
 {
-  NDN_CXX_LOG_TRACE("trace" << 2);
-  NDN_CXX_LOG_DEBUG("debug" << 2);
-  NDN_CXX_LOG_INFO("info" << 2);
-  NDN_CXX_LOG_WARN("warn" << 2);
-  NDN_CXX_LOG_ERROR("error" << 2);
-  NDN_CXX_LOG_FATAL("fatal" << 2);
+  NDN_LOG_TRACE("trace" << 2);
+  NDN_LOG_DEBUG("debug" << 2);
+  NDN_LOG_INFO("info" << 2);
+  NDN_LOG_WARN("warn" << 2);
+  NDN_LOG_ERROR("error" << 2);
+  NDN_LOG_FATAL("fatal" << 2);
 }
 
 } // namespace tests

tests/unit-tests/util/logging.t.cpp

diff --git a/tests/unit-tests/util/logging.t.cpp b/tests/unit-tests/util/logging.t.cpp
index da60ce1..f47b5a9 100644
--- a/tests/unit-tests/util/logging.t.cpp
+++ b/tests/unit-tests/util/logging.t.cpp
@@ -18,6 +18,7 @@
  *
  * See AUTHORS.md for complete list of ndn-cxx authors and contributors.
  */
+
 #include "util/logging.hpp"
 #include "util/logger.hpp"
 
@@ -46,12 +47,12 @@
   Logger& logger = *loggerPtr;
 
   auto getNdnCxxLogger = [&logger] () -> Logger& { return logger; };
-  NDN_CXX_LOG_TRACE("trace" << moduleName);
-  NDN_CXX_LOG_DEBUG("debug" << moduleName);
-  NDN_CXX_LOG_INFO("info" << moduleName);
-  NDN_CXX_LOG_WARN("warn" << moduleName);
-  NDN_CXX_LOG_ERROR("error" << moduleName);
-  NDN_CXX_LOG_FATAL("fatal" << moduleName);
+  NDN_LOG_TRACE("trace" << moduleName);
+  NDN_LOG_DEBUG("debug" << moduleName);
+  NDN_LOG_INFO("info" << moduleName);
+  NDN_LOG_WARN("warn" << moduleName);
+  NDN_LOG_ERROR("error" << moduleName);
+  NDN_LOG_FATAL("fatal" << moduleName);
 
   BOOST_CHECK(Logging::get().removeLogger(logger));
 }