commit 682e6b4c02a1dd105aa6f76f2c0e47712fff0869
author Davide Pesavento <davidepesa@gmail.com> Fri Oct 22 16:22:27 2021 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri Oct 22 16:22:27 2021 -0400
tree 9e4602b80cf4ea5552680daa8870558dd7d79eef
parent 83f8d167cabb7cfd3b26fc120de9b69b7640ff5c

Fix compilation on Android

Change-Id: I5e3cb8fb49a773425355400db72b4bb76654b5a5

ndn-cxx/util/logging.cpp

diff --git a/ndn-cxx/util/logging.cpp b/ndn-cxx/util/logging.cpp
index 77654fb..4367042 100644
--- a/ndn-cxx/util/logging.cpp
+++ b/ndn-cxx/util/logging.cpp
@@ -94,24 +94,20 @@
 
 Logging::Logging()
 {
-  // cannot call the static setDestination, as the singleton object is not yet constructed
 #ifndef __ANDROID__
-  bool wantAutoFlush = true;
-  const char* environ = std::getenv("NDN_LOG_NOFLUSH");
-  if (environ != nullptr) {
-    wantAutoFlush = false;
-  }
-
-  auto destination = makeDefaultStreamDestination(shared_ptr<std::ostream>(&std::clog, [] (auto) {}),
+  bool wantAutoFlush = std::getenv("NDN_LOG_NOFLUSH") == nullptr;
+  auto destination = makeDefaultStreamDestination(shared_ptr<std::ostream>(&std::clog, [] (auto&&) {}),
                                                   wantAutoFlush);
 #else
   auto destination = detail::makeAndroidLogger();
 #endif // __ANDROID__
+
+  // cannot call the static setDestination(), as the singleton object is not yet constructed
   this->setDestinationImpl(std::move(destination));
 
-  environ = std::getenv("NDN_LOG");
-  if (environ != nullptr) {
-    this->setLevelImpl(environ);
+  const char* env = std::getenv("NDN_LOG");
+  if (env != nullptr) {
+    this->setLevelImpl(env);
   }
 
   boost::log::core::get()->add_global_attribute("Timestamp",
@@ -260,7 +256,8 @@
 void
 Logging::setDestination(std::ostream& os, bool wantAutoFlush)
 {
-  auto destination = makeDefaultStreamDestination(shared_ptr<std::ostream>(&os, [] (auto) {}), wantAutoFlush);
+  auto destination = makeDefaultStreamDestination(shared_ptr<std::ostream>(&os, [] (auto&&) {}),
+                                                  wantAutoFlush);
   setDestination(std::move(destination));
 }
 
@@ -271,7 +268,7 @@
     : m_stdPtr(std::move(os))
   {
     auto_flush(wantAutoFlush);
-    add_stream(boost::shared_ptr<std::ostream>(m_stdPtr.get(), [] (auto) {}));
+    add_stream(boost::shared_ptr<std::ostream>(m_stdPtr.get(), [] (auto&&) {}));
   }
 
 private: