Skip to content

Commit

Permalink
Switch to Face::getIoContext()
Browse files Browse the repository at this point in the history
Change-Id: I56ea53ce8db3a3f24abe958065b9251eb025fbf7
  • Loading branch information
Pesa committed Nov 11, 2023
1 parent 690272d commit 60e5043
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
6 changes: 5 additions & 1 deletion .waf-tools/default-compiler-flags.py
Expand Up @@ -128,7 +128,11 @@ def getCompilerVersion(self, conf):

def getGeneralFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
return {
'CXXFLAGS': [],
'LINKFLAGS': [],
'DEFINES': ['BOOST_ASIO_NO_DEPRECATED', 'BOOST_FILESYSTEM_NO_DEPRECATED'],
}

def getDebugFlags(self, conf):
"""Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are needed only in debug mode"""
Expand Down
2 changes: 1 addition & 1 deletion PSync/consumer.cpp
Expand Up @@ -36,7 +36,7 @@ Consumer::Consumer(const ndn::Name& syncPrefix,
ndn::time::milliseconds helloInterestLifetime,
ndn::time::milliseconds syncInterestLifetime)
: m_face(face)
, m_scheduler(m_face.getIoService())
, m_scheduler(m_face.getIoContext())
, m_syncPrefix(syncPrefix)
, m_helloInterestPrefix(ndn::Name(m_syncPrefix).append("hello"))
, m_syncInterestPrefix(ndn::Name(m_syncPrefix).append("sync"))
Expand Down
4 changes: 2 additions & 2 deletions PSync/producer-base.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, The University of Memphis
* Copyright (c) 2014-2023, The University of Memphis
*
* This file is part of PSync.
* See AUTHORS.md for complete list of PSync authors and contributors.
Expand Down Expand Up @@ -37,7 +37,7 @@ ProducerBase::ProducerBase(ndn::Face& face,
CompressionScheme contentCompression)
: m_face(face)
, m_keyChain(keyChain)
, m_scheduler(m_face.getIoService())
, m_scheduler(m_face.getIoContext())
, m_rng(ndn::random::getRandomNumberEngine())
, m_iblt(expectedNumEntries, ibltCompression)
, m_segmentPublisher(m_face, m_keyChain)
Expand Down
4 changes: 2 additions & 2 deletions PSync/segment-publisher.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, The University of Memphis
* Copyright (c) 2014-2023, The University of Memphis
*
* This file is part of PSync.
* See AUTHORS.md for complete list of PSync authors and contributors.
Expand All @@ -24,7 +24,7 @@ namespace psync {
SegmentPublisher::SegmentPublisher(ndn::Face& face, ndn::KeyChain& keyChain,
const ndn::security::SigningInfo& signingInfo, size_t imsLimit)
: m_face(face)
, m_scheduler(m_face.getIoService())
, m_scheduler(m_face.getIoContext())
, m_segmenter(keyChain, signingInfo)
, m_ims(imsLimit)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/full-sync.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, The University of Memphis
* Copyright (c) 2014-2023, The University of Memphis
*
* This file is part of PSync.
* See AUTHORS.md for complete list of PSync authors and contributors.
Expand Down Expand Up @@ -91,7 +91,7 @@ class Producer
private:
ndn::Face m_face;
ndn::KeyChain m_keyChain;
ndn::Scheduler m_scheduler{m_face.getIoService()};
ndn::Scheduler m_scheduler{m_face.getIoContext()};

psync::FullProducer m_producer;
uint64_t m_maxNumPublish;
Expand Down
4 changes: 2 additions & 2 deletions examples/producer.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, The University of Memphis
* Copyright (c) 2014-2023, The University of Memphis
*
* This file is part of PSync.
* See AUTHORS.md for complete list of PSync authors and contributors.
Expand Down Expand Up @@ -82,7 +82,7 @@ class PSyncPartialProducer
private:
ndn::Face m_face;
ndn::KeyChain m_keyChain;
ndn::Scheduler m_scheduler{m_face.getIoService()};
ndn::Scheduler m_scheduler{m_face.getIoContext()};

psync::PartialProducer m_producer;
uint64_t m_maxNumPublish;
Expand Down

0 comments on commit 60e5043

Please sign in to comment.