commit fa2aa50d8df42b182e2af5f13d6d64ea0cd0fc91
author Davide Pesavento <davidepesa@gmail.com> Fri Mar 22 13:30:02 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Fri Mar 22 21:44:29 2019 -0400
tree 8d63a85fff3a7fdaf845adf715e9f0f1b69fb4e1
parent 0a71dd3a00e95e3c4df4298ce21ccffd6c42afa4

face+tools: fix compilation with Boost 1.69.0

Refs: #4890
Change-Id: I64c2e6ac99767fbd0b8afa9669eb6097148f8628

tests/daemon/fw/unsolicited-data-policy.t.cpp

diff --git a/tests/daemon/fw/unsolicited-data-policy.t.cpp b/tests/daemon/fw/unsolicited-data-policy.t.cpp
index 8cc7a70..e6b73ad 100644
--- a/tests/daemon/fw/unsolicited-data-policy.t.cpp
+++ b/tests/daemon/fw/unsolicited-data-policy.t.cpp
@@ -61,12 +61,12 @@
 
     tribool isFound = indeterminate;
     cs.find(Interest(data.getFullName()),
-      bind([&] { isFound = true; }),
-      bind([&] { isFound = false; }));
+            bind([&] { isFound = true; }),
+            bind([&] { isFound = false; }));
 
-    this->advanceClocks(time::milliseconds(1));
+    this->advanceClocks(1_ms);
     BOOST_REQUIRE(!indeterminate(isFound));
-    return isFound;
+    return bool(isFound);
   }
 
 protected:

tests/daemon/mgmt/face-manager-update-face.t.cpp

diff --git a/tests/daemon/mgmt/face-manager-update-face.t.cpp b/tests/daemon/mgmt/face-manager-update-face.t.cpp
index 1be0647..4cd6fb6 100644
--- a/tests/daemon/mgmt/face-manager-update-face.t.cpp
+++ b/tests/daemon/mgmt/face-manager-update-face.t.cpp
@@ -74,7 +74,7 @@
     params.setFlagBit(ndn::nfd::BIT_LP_RELIABILITY_ENABLED, enableReliability);
 
     if (!boost::logic::indeterminate(enableCongestionMarking)) {
-      params.setFlagBit(ndn::nfd::BIT_CONGESTION_MARKING_ENABLED, enableCongestionMarking);
+      params.setFlagBit(ndn::nfd::BIT_CONGESTION_MARKING_ENABLED, bool(enableCongestionMarking));
     }
 
     createFace(params);