SunnyQjm/ChronoSync
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Fix compilation errors and deprecation warnings

Browse Source 
Change-Id: Ibbe2d30ced038f0c46a8669b5957b68c4f265350
This commit is contained in:
Alexander Afanasyev committed 2014-07-02 12:17:46 -07:00
1 parent 7c97cfa743
commit 7fe59830f4
6 files changed
+28 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/test-socket.cc
+7 -7
View File
@@ -139,9 +139,9 @@ public:
class TestSet1{
public:
TestSet1(ndn::shared_ptr<boost::asio::io_service> ioService)
: m_face1(new ndn::Face(ioService))
, m_face2(new ndn::Face(ioService))
, m_face3(new ndn::Face(ioService))
: m_face1(new ndn::Face(*ioService))
, m_face2(new ndn::Face(*ioService))
, m_face3(new ndn::Face(*ioService))
, m_name1("/irl.cs.ucla.edu/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
, m_name2("/yakshi.org/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
, m_name3("/google.com/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
@@ -298,8 +298,8 @@ public:
class TestSet2{
public:
TestSet2(ndn::shared_ptr<boost::asio::io_service> ioService)
: m_face1(new ndn::Face(ioService))
, m_face2(new ndn::Face(ioService))
: m_face1(new ndn::Face(*ioService))
, m_face2(new ndn::Face(*ioService))
, m_name1("/xiaonei.com/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
, m_name2("/mitbbs.com/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
{
@@ -416,8 +416,8 @@ public:
class TestSet3{
public:
TestSet3(ndn::shared_ptr<boost::asio::io_service> ioService)
: m_face1(new ndn::Face(ioService))
, m_face2(new ndn::Face(ioService))
: m_face1(new ndn::Face(*ioService))
, m_face2(new ndn::Face(*ioService))
, m_name1("/xiaonei.com/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
, m_name2("/mitbbs.com/" + boost::lexical_cast<std::string>(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count()))
{
tests/test-sync-validator.cc
+9 -5
View File
@@ -6,6 +6,10 @@
#include <boost/test/unit_test.hpp>
#include "sync-validator.h"
#include <boost/lexical_cast.hpp>
#include <boost/asio.hpp>
#include <ndn-cxx/util/scheduler.hpp>
BOOST_AUTO_TEST_SUITE(TestSyncValidator)
void
@@ -68,7 +72,7 @@ BOOST_AUTO_TEST_CASE (Graph)
shared_ptr<IdentityCertificate> introducee2 = keychain.getCertificate(certName5);
shared_ptr<boost::asio::io_service> ioService = make_shared<boost::asio::io_service>();
shared_ptr<Face> face = make_shared<Face>(ioService);
shared_ptr<Face> face = make_shared<Face>(ref(*ioService));
shared_ptr<SecRuleRelative> rule;
SyncValidator validator(prefix, *anchor, *face,
bind(&publishData, _1, _2, _3),
@@ -151,7 +155,7 @@ BOOST_AUTO_TEST_CASE (OfflineValidate)
shared_ptr<IdentityCertificate> introducee2 = keychain.getCertificate(certName5);
shared_ptr<boost::asio::io_service> ioService = make_shared<boost::asio::io_service>();
shared_ptr<Face> face = make_shared<Face>(ioService);
shared_ptr<Face> face = make_shared<Face>(ref(*ioService));
shared_ptr<SecRuleRelative> rule;
SyncValidator validator(prefix, *anchor, *face,
bind(&publishData, _1, _2, _3),
@@ -246,7 +250,7 @@ struct FacesFixture
void
terminate(ndn::shared_ptr<ndn::Face> face)
{
face->ioService()->stop();
face->getIoService().stop();
}
const ndn::RegisteredPrefixId* regPrefixId;
@@ -282,8 +286,8 @@ BOOST_FIXTURE_TEST_CASE(OnlineValidate, FacesFixture)
shared_ptr<IdentityCertificate> introducee2 = keychain.getCertificate(certName4);
shared_ptr<boost::asio::io_service> ioService = make_shared<boost::asio::io_service>();
shared_ptr<Face> face = make_shared<Face>(ioService);
shared_ptr<Face> face2 = make_shared<Face>(ioService);
shared_ptr<Face> face = make_shared<Face>(ref(*ioService));
shared_ptr<Face> face2 = make_shared<Face>(ref(*ioService));
shared_ptr<SecRuleRelative> rule;
shared_ptr<SyncValidator> validator = shared_ptr<SyncValidator>