commit f9f3910dd25b9cd6e1fe6676a0e4d79bb9400cdf
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 01 17:43:40 2015 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 04 13:25:28 2015 -0800
tree 5a4dbeb093297ec1db7118b8ec7386f943048f76
parent 53c0e3e9eeb9ba012d678bca71e89834c736ffea

build+nsync+tests+docs: Fix compilation for boost 1.59, doxygen docs, and other fixes

Requires ndn-cxx:commit:e3e2505aa03e0b298e1a8dfc9876f1f8dafcaaba (ndn-cxx-0.4.0-beta2-11-ge3e2505)
or earlier commit.

Change-Id: I6ad359aa368b3346464f2aa74a1ab319fcd3ab7a

tests/identity-fixture.cpp

diff --git a/tests/identity-fixture.cpp b/tests/identity-fixture.cpp
index 36ab807..3efdf00 100644
--- a/tests/identity-fixture.cpp
+++ b/tests/identity-fixture.cpp
@@ -95,5 +95,8 @@
 };
 
 BOOST_GLOBAL_FIXTURE(IdentityFixture)
+#if BOOST_VERSION >= 105900
+;
+#endif // BOOST_VERSION >= 105900
 
 } // namespace nlsr

tests/publisher/publisher-fixture.hpp

diff --git a/tests/publisher/publisher-fixture.hpp b/tests/publisher/publisher-fixture.hpp
index 07da594..2edb668 100644
--- a/tests/publisher/publisher-fixture.hpp
+++ b/tests/publisher/publisher-fixture.hpp
@@ -86,7 +86,7 @@
     CoordinateLsa lsa(origin, CoordinateLsa::TYPE_STRING, 1, ndn::time::system_clock::now(),
                       radius, angle);
 
-    return std::move(lsa);
+    return lsa;
   }
 
   void

tests/test-conf-parameter.cpp

diff --git a/tests/test-conf-parameter.cpp b/tests/test-conf-parameter.cpp
index 18eebdc..f773fd5 100644
--- a/tests/test-conf-parameter.cpp
+++ b/tests/test-conf-parameter.cpp
@@ -75,7 +75,7 @@
 
   BOOST_CHECK_EQUAL(cp1.getRouterPrefix(), "/ATT/memphis/router1");
 
-  BOOST_CHECK_EQUAL(cp1.getInterestRetryNumber(), (uint32_t)2);
+  BOOST_CHECK_EQUAL(cp1.getInterestRetryNumber(), 2);
 
   BOOST_CHECK_EQUAL(cp1.getInterestResendTime(), 1000);