Switch to Face::getIoContext()
Change-Id: Ice05b0b8e9af4ed4651abcf6fc4ea6b84c34da7c
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 7746db9..4e09a82 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -128,7 +128,11 @@
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"""
diff --git a/tests/dump/ndndump.t.cpp b/tests/dump/ndndump.t.cpp
index f3aa0df..b467795 100644
--- a/tests/dump/ndndump.t.cpp
+++ b/tests/dump/ndndump.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, University of Memphis,
+ * Copyright (c) 2014-2023, University of Memphis,
* University Pierre & Marie Curie, Sorbonne University.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
@@ -32,6 +32,7 @@
#include <boost/test/tools/output_test_stream.hpp>
#include <ndn-cxx/encoding/encoding-buffer.hpp>
+#include <ndn-cxx/lp/fields.hpp>
#include <ndn-cxx/lp/packet.hpp>
#include <ndn-cxx/net/ethernet.hpp>
diff --git a/tools/chunks/catchunks/data-fetcher.cpp b/tools/chunks/catchunks/data-fetcher.cpp
index 2e5fc9e..15645b0 100644
--- a/tools/chunks/catchunks/data-fetcher.cpp
+++ b/tools/chunks/catchunks/data-fetcher.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2016-2022, Regents of the University of California,
+ * Copyright (c) 2016-2023, Regents of the University of California,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University.
*
@@ -50,7 +50,7 @@
DataCallback onData, FailureCallback onNack, FailureCallback onTimeout,
bool isVerbose)
: m_face(face)
- , m_scheduler(m_face.getIoService())
+ , m_scheduler(m_face.getIoContext())
, m_onData(std::move(onData))
, m_onNack(std::move(onNack))
, m_onTimeout(std::move(onTimeout))
diff --git a/tools/chunks/catchunks/pipeline-interests-adaptive.cpp b/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
index 891b94e..d4376b7 100644
--- a/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
+++ b/tools/chunks/catchunks/pipeline-interests-adaptive.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2016-2022, Regents of the University of California,
+ * Copyright (c) 2016-2023, Regents of the University of California,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University.
*
@@ -29,7 +29,6 @@
#include "pipeline-interests-adaptive.hpp"
#include "data-fetcher.hpp"
-#include <cmath>
#include <iomanip>
namespace ndn::chunks {
@@ -41,7 +40,7 @@
, m_cwnd(m_options.initCwnd)
, m_ssthresh(m_options.initSsthresh)
, m_rttEstimator(rttEstimator)
- , m_scheduler(m_face.getIoService())
+ , m_scheduler(m_face.getIoContext())
{
}
diff --git a/tools/chunks/catchunks/pipeline-interests.cpp b/tools/chunks/catchunks/pipeline-interests.cpp
index ec30dd7..b7251ed 100644
--- a/tools/chunks/catchunks/pipeline-interests.cpp
+++ b/tools/chunks/catchunks/pipeline-interests.cpp
@@ -103,7 +103,7 @@
cancel();
if (m_onFailure) {
- boost::asio::post(m_face.getIoService(), [this, reason] { m_onFailure(reason); });
+ boost::asio::post(m_face.getIoContext(), [this, reason] { m_onFailure(reason); });
}
}
diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index 4b28c63..00f2422 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2011-2022, Regents of the University of California.
+ * Copyright (c) 2011-2023, Regents of the University of California.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
* See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -31,6 +31,7 @@
#include <iomanip>
#include <sstream>
+#include <ndn-cxx/lp/fields.hpp>
#include <ndn-cxx/lp/nack.hpp>
#include <ndn-cxx/lp/packet.hpp>
#include <ndn-cxx/net/ethernet.hpp>
diff --git a/tools/peek/ndnpeek/ndnpeek.cpp b/tools/peek/ndnpeek/ndnpeek.cpp
index 3fb540f..3673224 100644
--- a/tools/peek/ndnpeek/ndnpeek.cpp
+++ b/tools/peek/ndnpeek/ndnpeek.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -34,7 +34,7 @@
NdnPeek::NdnPeek(Face& face, const PeekOptions& options)
: m_options(options)
, m_face(face)
- , m_scheduler(m_face.getIoService())
+ , m_scheduler(m_face.getIoContext())
{
}
diff --git a/tools/peek/ndnpoke/ndnpoke.cpp b/tools/peek/ndnpoke/ndnpoke.cpp
index 27feb17..62a6c4a 100644
--- a/tools/peek/ndnpoke/ndnpoke.cpp
+++ b/tools/peek/ndnpoke/ndnpoke.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -37,7 +37,7 @@
, m_face(face)
, m_keyChain(keyChain)
, m_input(input)
- , m_scheduler(m_face.getIoService())
+ , m_scheduler(m_face.getIoContext())
{
}
diff --git a/tools/ping/client/main.cpp b/tools/ping/client/main.cpp
index a37a461..bcef47a 100644
--- a/tools/ping/client/main.cpp
+++ b/tools/ping/client/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Arizona Board of Regents.
+ * Copyright (c) 2014-2023, Arizona Board of Regents.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
* See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -42,8 +42,8 @@
: m_ping(m_face, options)
, m_statisticsCollector(m_ping, options)
, m_tracer(m_ping, options)
- , m_signalSetInt(m_face.getIoService(), SIGINT)
- , m_signalSetQuit(m_face.getIoService(), SIGQUIT)
+ , m_signalSetInt(m_face.getIoContext(), SIGINT)
+ , m_signalSetQuit(m_face.getIoContext(), SIGQUIT)
{
m_signalSetInt.async_wait([this] (const auto& err, int) { onInterruptSignal(err); });
m_signalSetQuit.async_wait([this] (const auto& err, int) { onQuitSignal(err); });
diff --git a/tools/ping/client/ping.cpp b/tools/ping/client/ping.cpp
index 5ce8765..b2cf699 100644
--- a/tools/ping/client/ping.cpp
+++ b/tools/ping/client/ping.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Arizona Board of Regents.
+ * Copyright (c) 2014-2023, Arizona Board of Regents.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
* See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -31,7 +31,7 @@
: m_options(options)
, m_nextSeq(options.startSeq)
, m_face(face)
- , m_scheduler(m_face.getIoService())
+ , m_scheduler(m_face.getIoContext())
{
if (m_options.shouldGenerateRandomSeq) {
m_nextSeq = random::generateWord64();
diff --git a/tools/ping/server/main.cpp b/tools/ping/server/main.cpp
index bf050da..41ec490 100644
--- a/tools/ping/server/main.cpp
+++ b/tools/ping/server/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2015-2022, Arizona Board of Regents.
+ * Copyright (c) 2015-2023, Arizona Board of Regents.
*
* This file is part of ndn-tools (Named Data Networking Essential Tools).
* See AUTHORS.md for complete list of ndn-tools authors and contributors.
@@ -43,7 +43,7 @@
: m_options(options)
, m_pingServer(m_face, m_keyChain, options)
, m_tracer(m_pingServer, options)
- , m_signalSet(m_face.getIoService(), SIGINT)
+ , m_signalSet(m_face.getIoContext(), SIGINT)
{
m_pingServer.afterFinish.connect([this] {
m_pingServer.stop();