Refactor and modernize namespace declarations
Move all unit tests to namespace nfd::tests
Delete unused header core/algorithm.hpp
Change-Id: I5591f0c5f3bb5db67f8b45fae95471f8a555ca68
diff --git a/tests/daemon/face/dummy-transport.hpp b/tests/daemon/face/dummy-transport.hpp
index 8ebb582..2eb21fe 100644
--- a/tests/daemon/face/dummy-transport.hpp
+++ b/tests/daemon/face/dummy-transport.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2020, 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,
@@ -30,9 +30,7 @@
#include "face/null-transport.hpp"
-namespace nfd {
-namespace face {
-namespace tests {
+namespace nfd::tests {
/** \brief Dummy Transport type used in unit tests.
*
@@ -41,7 +39,7 @@
* All persistency changes are recorded in `persistencyHistory`.
*/
template<bool CAN_CHANGE_PERSISTENCY>
-class DummyTransportBase : public NullTransport
+class DummyTransportBase : public face::NullTransport
{
public:
explicit
@@ -50,8 +48,8 @@
ndn::nfd::FaceScope scope = ndn::nfd::FACE_SCOPE_NON_LOCAL,
ndn::nfd::FacePersistency persistency = ndn::nfd::FACE_PERSISTENCY_PERSISTENT,
ndn::nfd::LinkType linkType = ndn::nfd::LINK_TYPE_POINT_TO_POINT,
- ssize_t mtu = MTU_UNLIMITED,
- ssize_t sendQueueCapacity = QUEUE_UNSUPPORTED)
+ ssize_t mtu = face::MTU_UNLIMITED,
+ ssize_t sendQueueCapacity = face::QUEUE_UNSUPPORTED)
: NullTransport(FaceUri(localUri), FaceUri(remoteUri), scope, persistency)
{
this->setLinkType(linkType);
@@ -110,8 +108,6 @@
using DummyTransport = DummyTransportBase<true>;
-} // namespace tests
-} // namespace face
-} // namespace nfd
+} // namespace nfd::tests
#endif // NFD_TESTS_DAEMON_FACE_DUMMY_TRANSPORT_HPP