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/test-ip.hpp b/tests/daemon/face/test-ip.hpp
index 1b8604e..c2bb8ca 100644
--- a/tests/daemon/face/test-ip.hpp
+++ b/tests/daemon/face/test-ip.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, 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,
@@ -31,9 +31,7 @@
#include <boost/asio/ip/address.hpp>
#include <ndn-cxx/net/network-address.hpp>
-namespace nfd {
-namespace face {
-namespace tests {
+namespace nfd::tests {
enum class AddressFamily {
V4 = static_cast<int>(ndn::net::AddressFamily::V4),
@@ -92,9 +90,11 @@
AddressScope scope = AddressScope::Any,
MulticastInterface mcast = MulticastInterface::Any);
+} // namespace nfd::tests
+
/** \brief Skip the rest of the test case if \p address is unavailable
*
- * This macro can be used in conjunction with nfd::tests::getTestIp in a test case. Example:
+ * This macro can be used in conjunction with nfd::tests::getTestIp() in a test case. Example:
* \code
* BOOST_AUTO_TEST_CASE(TestCase)
* {
@@ -112,8 +112,4 @@
} \
} while (false)
-} // namespace tests
-} // namespace face
-} // namespace nfd
-
#endif // NFD_TESTS_DAEMON_FACE_TEST_IP_HPP