build: switch to C++17
Change-Id: Ie68020a04b7e20b74778b6d0370544ded55c5e26
diff --git a/tests/daemon/face/channel-fixture.hpp b/tests/daemon/face/channel-fixture.hpp
index 31a9439..c3d07c6 100644
--- a/tests/daemon/face/channel-fixture.hpp
+++ b/tests/daemon/face/channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -43,8 +43,7 @@
template<class ChannelT, class EndpointT>
class ChannelFixture : public GlobalIoFixture
{
- static_assert(std::is_base_of<Channel, ChannelT>::value,
- "ChannelFixture must be instantiated with a type derived from Channel");
+ static_assert(std::is_base_of_v<Channel, ChannelT>);
public:
virtual
@@ -71,14 +70,15 @@
}
virtual shared_ptr<ChannelT>
- makeChannel(const boost::asio::ip::address&, uint16_t port = 0, optional<size_t> mtu = nullopt)
+ makeChannel(const boost::asio::ip::address&, uint16_t port = 0,
+ std::optional<size_t> mtu = std::nullopt)
{
BOOST_FAIL("Unimplemented");
return nullptr;
}
void
- listen(const boost::asio::ip::address& addr, optional<size_t> mtu = nullopt)
+ listen(const boost::asio::ip::address& addr, std::optional<size_t> mtu = std::nullopt)
{
listenerEp = EndpointT{addr, 7030};
listenerChannel = makeChannel(addr, 7030, mtu);
diff --git a/tests/daemon/face/face.t.cpp b/tests/daemon/face/face.t.cpp
index 641088f..bcaa90a 100644
--- a/tests/daemon/face/face.t.cpp
+++ b/tests/daemon/face/face.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -114,7 +114,7 @@
}
for (size_t i = 0; i < nInNacks; ++i) {
- face1->receiveNack(makeNack(*makeInterest("/StnEVTj4Ex", false, nullopt, 561),
+ face1->receiveNack(makeNack(*makeInterest("/StnEVTj4Ex", false, std::nullopt, 561),
lp::NackReason::CONGESTION), 0);
}
@@ -127,7 +127,7 @@
}
for (size_t i = 0; i < nOutNacks; ++i) {
- face1->sendNack(makeNack(*makeInterest("/9xK6FbwIBM", false, nullopt, 365),
+ face1->sendNack(makeNack(*makeInterest("/9xK6FbwIBM", false, std::nullopt, 365),
lp::NackReason::CONGESTION));
}
diff --git a/tests/daemon/face/factory-test-common.hpp b/tests/daemon/face/factory-test-common.hpp
index f92d388..4e65d34 100644
--- a/tests/daemon/face/factory-test-common.hpp
+++ b/tests/daemon/face/factory-test-common.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2018, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -44,7 +44,7 @@
inline void
createFace(ProtocolFactory& factory,
const FaceUri& remoteUri,
- const optional<FaceUri>& localUri,
+ const std::optional<FaceUri>& localUri,
const FaceParams& params,
const CreateFaceExpectedResult& expected,
const std::function<void(const Face&)>& extraChecks = nullptr)
diff --git a/tests/daemon/face/generic-link-service.t.cpp b/tests/daemon/face/generic-link-service.t.cpp
index 219154e..11aeeb8 100644
--- a/tests/daemon/face/generic-link-service.t.cpp
+++ b/tests/daemon/face/generic-link-service.t.cpp
@@ -193,7 +193,7 @@
options.allowLocalFields = false;
initialize(options);
- auto nack1 = makeNack(*makeInterest("/localhost/test", false, nullopt, 323),
+ auto nack1 = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 323),
lp::NackReason::NO_ROUTE);
face->sendNack(nack1);
@@ -282,7 +282,7 @@
options.allowLocalFields = false;
initialize(options);
- lp::Nack nack1 = makeNack(*makeInterest("/localhost/test", false, nullopt, 323),
+ lp::Nack nack1 = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 323),
lp::NackReason::NO_ROUTE);
lp::Packet lpPacket;
lpPacket.set<lp::FragmentField>(std::make_pair(
@@ -538,7 +538,7 @@
options.reliabilityOptions.isEnabled = true;
initialize(options);
- auto nack1 = makeNack(*makeInterest("/localhost/test", false, nullopt, 323),
+ auto nack1 = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 323),
lp::NackReason::NO_ROUTE);
face->sendNack(nack1);
@@ -970,7 +970,7 @@
options.allowLocalFields = true;
initialize(options);
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
lp::Packet packet;
packet.set<lp::FragmentField>(std::make_pair(
@@ -1030,7 +1030,7 @@
options.allowLocalFields = true;
initialize(options);
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
lp::Packet packet(nack.getInterest().wireEncode());
packet.set<lp::NackField>(nack.getHeader());
@@ -1122,7 +1122,7 @@
options.allowLocalFields = true;
initialize(options);
- lp::Nack nack = makeNack(*makeInterest("/TPAhdiHz", false, nullopt, 278),
+ lp::Nack nack = makeNack(*makeInterest("/TPAhdiHz", false, std::nullopt, 278),
lp::NackReason::CONGESTION);
lp::Packet packet(nack.getInterest().wireEncode());
packet.set<lp::NackField>(nack.getHeader());
@@ -1163,7 +1163,7 @@
BOOST_AUTO_TEST_CASE(SendCongestionMarkNack)
{
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
nack.setTag(make_shared<lp::CongestionMarkTag>(std::numeric_limits<uint64_t>::max()));
@@ -1205,7 +1205,7 @@
BOOST_AUTO_TEST_CASE(ReceiveCongestionMarkNack)
{
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
lp::Packet packet;
packet.set<lp::FragmentField>(std::make_pair(
@@ -1310,7 +1310,7 @@
options.allowSelfLearning = true;
initialize(options);
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
lp::Packet packet;
packet.set<lp::FragmentField>(std::make_pair(
@@ -1418,7 +1418,7 @@
options.allowSelfLearning = true;
initialize(options);
- lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, nullopt, 123),
+ lp::Nack nack = makeNack(*makeInterest("/localhost/test", false, std::nullopt, 123),
lp::NackReason::NO_ROUTE);
lp::Packet packet;
packet.set<lp::FragmentField>(std::make_pair(
diff --git a/tests/daemon/face/lp-reliability.t.cpp b/tests/daemon/face/lp-reliability.t.cpp
index e3a84c9..526708f 100644
--- a/tests/daemon/face/lp-reliability.t.cpp
+++ b/tests/daemon/face/lp-reliability.t.cpp
@@ -33,6 +33,7 @@
#include "dummy-transport.hpp"
#include <cstring>
+#include <unordered_set>
namespace nfd {
namespace face {
diff --git a/tests/daemon/face/tcp-channel-fixture.hpp b/tests/daemon/face/tcp-channel-fixture.hpp
index ca0f28e..ab8d431 100644
--- a/tests/daemon/face/tcp-channel-fixture.hpp
+++ b/tests/daemon/face/tcp-channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -44,7 +44,8 @@
}
shared_ptr<TcpChannel>
- makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0, optional<size_t> mtu = nullopt) final
+ makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0,
+ std::optional<size_t> mtu = std::nullopt) final
{
if (port == 0)
port = getNextPort();
diff --git a/tests/daemon/face/test-netif.cpp b/tests/daemon/face/test-netif.cpp
index d97ce47..36719ad 100644
--- a/tests/daemon/face/test-netif.cpp
+++ b/tests/daemon/face/test-netif.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2019, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -44,7 +44,7 @@
std::vector<shared_ptr<const NetworkInterface>>
collectNetworkInterfaces(bool allowCached)
{
- static optional<std::vector<shared_ptr<const NetworkInterface>>> cached;
+ static std::optional<std::vector<shared_ptr<const NetworkInterface>>> cached;
if (!allowCached || !cached) {
NetworkMonitor netmon(getGlobalIoService());
cached = enumerateNetworkInterfaces(netmon);
diff --git a/tests/daemon/face/udp-channel-fixture.hpp b/tests/daemon/face/udp-channel-fixture.hpp
index 6f57b90..ac30738 100644
--- a/tests/daemon/face/udp-channel-fixture.hpp
+++ b/tests/daemon/face/udp-channel-fixture.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2021, Regents of the University of California,
+ * Copyright (c) 2014-2022, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -39,12 +39,14 @@
{
protected:
shared_ptr<UdpChannel>
- makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0, optional<size_t> mtu = nullopt) final
+ makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0,
+ std::optional<size_t> mtu = std::nullopt) final
{
if (port == 0)
port = getNextPort();
- return std::make_shared<UdpChannel>(udp::Endpoint(addr, port), 2_s, false, mtu.value_or(ndn::MAX_NDN_PACKET_SIZE));
+ return std::make_shared<UdpChannel>(udp::Endpoint(addr, port), 2_s, false,
+ mtu.value_or(ndn::MAX_NDN_PACKET_SIZE));
}
void
diff --git a/tests/daemon/face/websocket-channel-fixture.hpp b/tests/daemon/face/websocket-channel-fixture.hpp
index 3072992..62c717b 100644
--- a/tests/daemon/face/websocket-channel-fixture.hpp
+++ b/tests/daemon/face/websocket-channel-fixture.hpp
@@ -39,7 +39,7 @@
protected:
shared_ptr<WebSocketChannel>
makeChannel(const boost::asio::ip::address& addr, uint16_t port = 0,
- optional<size_t> mtu = nullopt) final
+ std::optional<size_t> mtu = std::nullopt) final
{
if (port == 0)
port = getNextPort();