Refactor nested namespace to C++17 style

Signed-off-by: Leonard Ossa <leonard.ossa@openvpn.com>
OpenVPN · Jul 3, 2024 · 3646265 · 3646265
1 parent a89b6cb
commit 3646265
Show file tree

Hide file tree

Showing 201 changed files with 403 additions and 838 deletions.
diff --git a/openvpn/acceptor/base.hpp b/openvpn/acceptor/base.hpp
@@ -39,8 +39,7 @@
 #define OPENVPN_ACCEPTOR_LISTENER_BASE_RC RC<thread_unsafe_refcount>
 #endif
 
-namespace openvpn {
-namespace Acceptor {
+namespace openvpn::Acceptor {
 
 struct ListenerBase : public OPENVPN_ACCEPTOR_LISTENER_BASE_RC
 {
@@ -91,5 +90,4 @@ struct Set : public std::vector<Item>
     }
 };
 
-} // namespace Acceptor
-} // namespace openvpn
+} // namespace openvpn::Acceptor
diff --git a/openvpn/acceptor/namedpipe.hpp b/openvpn/acceptor/namedpipe.hpp
@@ -25,8 +25,7 @@
 #include <openvpn/win/scoped_handle.hpp>
 #include <openvpn/win/secattr.hpp>
 
-namespace openvpn {
-namespace Acceptor {
+namespace openvpn::Acceptor {
 
 class NamedPipe : public Base
 {
@@ -113,5 +112,4 @@ class NamedPipe : public Base
     Win::SecurityAttributes sa;
 };
 
-} // namespace Acceptor
-} // namespace openvpn
+} // namespace openvpn::Acceptor
diff --git a/openvpn/acceptor/tcp.hpp b/openvpn/acceptor/tcp.hpp
@@ -24,8 +24,7 @@
 #include <openvpn/acceptor/base.hpp>
 #include <openvpn/ssl/sslconsts.hpp>
 
-namespace openvpn {
-namespace Acceptor {
+namespace openvpn::Acceptor {
 
 struct TCP : public Base
 {
@@ -93,5 +92,4 @@ struct TCP : public Base
     openvpn_io::ip::tcp::acceptor acceptor;
 };
 
-} // namespace Acceptor
-} // namespace openvpn
+} // namespace openvpn::Acceptor
diff --git a/openvpn/acceptor/unix.hpp b/openvpn/acceptor/unix.hpp
@@ -26,8 +26,7 @@
 
 #include <openvpn/acceptor/base.hpp>
 
-namespace openvpn {
-namespace Acceptor {
+namespace openvpn::Acceptor {
 
 struct Unix : public Base
 {
@@ -76,5 +75,4 @@ struct Unix : public Base
     openvpn_io::basic_socket_acceptor<openvpn_io::local::stream_protocol> acceptor;
 };
 
-} // namespace Acceptor
-} // namespace openvpn
+} // namespace openvpn::Acceptor
diff --git a/openvpn/addr/addrlist.hpp b/openvpn/addr/addrlist.hpp
@@ -25,8 +25,7 @@
 #include <openvpn/common/rc.hpp>
 #include <openvpn/addr/ip.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 
 // A list of unique IP addresses
 class AddrList : public std::vector<IP::Addr>, public RC<thread_unsafe_refcount>
@@ -59,7 +58,6 @@ class AddrList : public std::vector<IP::Addr>, public RC<thread_unsafe_refcount>
       }
 #endif
 };
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #endif
diff --git a/openvpn/addr/addrpair.hpp b/openvpn/addr/addrpair.hpp
@@ -29,8 +29,7 @@
 #include <openvpn/common/split.hpp>
 #include <openvpn/addr/ip.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 
 // AddrMaskPair is basically an object that combines an IP address (v4 or v6)
 // with a netmask or prefix length.
@@ -218,7 +217,6 @@ struct AddrMaskPair
     }
 };
 OPENVPN_OSTREAM(AddrMaskPair, to_string)
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #endif
diff --git a/openvpn/addr/addrspacesplit.hpp b/openvpn/addr/addrspacesplit.hpp
@@ -27,8 +27,7 @@
 #include <openvpn/common/exception.hpp>
 #include <openvpn/addr/route.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 class AddressSpaceSplitter : public RouteList
 {
   public:
@@ -108,5 +107,4 @@ class AddressSpaceSplitter : public RouteList
         return type;
     }
 };
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
diff --git a/openvpn/addr/ip.hpp b/openvpn/addr/ip.hpp
@@ -37,14 +37,13 @@
 
 #define OPENVPN_IP_THROW(ERR) throw openvpn::IP::ip_exception(ERR)
 
-namespace openvpn {
-// This is our fundamental IP address class that handles IPv4 or IPv6
-// IP addresses.  It is implemented as a discriminated union of IPv4::Addr
-// and IPv6::Addr.
-namespace IP {
+namespace openvpn::IP {
 
 OPENVPN_EXCEPTION(ip_exception);
 
+// This is our fundamental IP address class that handles IPv4 or IPv6
+// IP addresses.  It is implemented as a discriminated union of IPv4::Addr
+// and IPv6::Addr.
 class Addr
 {
   public:
@@ -1132,8 +1131,7 @@ class Addr
 };
 
 OPENVPN_OSTREAM(Addr, to_string)
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #ifdef USE_OPENVPN_HASH
 OPENVPN_HASH_METHOD(openvpn::IP::Addr, hashval);

diff --git a/openvpn/addr/iperr.hpp b/openvpn/addr/iperr.hpp
@@ -31,9 +31,7 @@
 #include <openvpn/common/stringtempl2.hpp>
 #endif
 
-namespace openvpn {
-namespace IP {
-namespace internal {
+namespace openvpn::IP::internal {
 
 #ifndef OPENVPN_LEGACY_TITLE_ABSTRACTION
 
@@ -112,6 +110,4 @@ inline std::string format_error(const std::string &ipstr, const char *title, con
 }
 
 #endif
-} // namespace internal
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP::internal
diff --git a/openvpn/addr/pool.hpp b/openvpn/addr/pool.hpp
@@ -33,8 +33,7 @@
 #include <openvpn/addr/ip.hpp>
 #include <openvpn/addr/range.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 
 // Maintain a pool of IP addresses.
 // A should be IP::Addr, IPv4::Addr, or IPv6::Addr.
@@ -163,7 +162,6 @@ class PoolType
 };
 
 typedef PoolType<IP::Addr> Pool;
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #endif
diff --git a/openvpn/addr/randaddr.hpp b/openvpn/addr/randaddr.hpp
@@ -25,8 +25,7 @@
 #include <openvpn/common/exception.hpp>
 #include <openvpn/random/randapi.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 
 inline IPv4::Addr random_addr_v4(RandomAPI &prng)
 {
@@ -64,5 +63,4 @@ inline Route random_subnet(const Route &templ,
                      & Addr::netmask_from_prefix_len(templ.addr.version(), prefix_len),
                  prefix_len);
 }
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
diff --git a/openvpn/addr/range.hpp b/openvpn/addr/range.hpp
@@ -30,8 +30,7 @@
 
 #include <openvpn/addr/ip.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 
 // Denote a range of IP addresses with a start and extent,
 // where A represents an address class.
@@ -157,7 +156,6 @@ class RangePartitionType
 
 typedef RangeType<IP::Addr> Range;
 typedef RangePartitionType<IP::Addr> RangePartition;
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #endif
diff --git a/openvpn/addr/regex.hpp b/openvpn/addr/regex.hpp
@@ -27,8 +27,7 @@
 
 #include <string>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 inline std::string v4_regex()
 {
     const std::string ipv4seg = "(?:25[0-5]|(?:2[0-4]|1{0,1}[0-9]){0,1}[0-9])";
@@ -55,7 +54,6 @@ inline std::string v6_regex()
         ")";
     // clang-format on
 }
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #endif
diff --git a/openvpn/addr/regex_static.hpp b/openvpn/addr/regex_static.hpp
@@ -27,8 +27,7 @@
 
 #include <openvpn/addr/regex.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 inline const std::regex re_v4(v4_regex(), std::regex_constants::ECMAScript | std::regex_constants::nosubs);
 inline const std::regex re_v6(v6_regex(), std::regex_constants::ECMAScript | std::regex_constants::nosubs);
 
@@ -46,5 +45,4 @@ inline bool is_ip_address(const std::string &host)
 {
     return is_ipv4_address(host) || is_ipv6_address(host);
 }
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
diff --git a/openvpn/addr/route.hpp b/openvpn/addr/route.hpp
@@ -36,8 +36,7 @@
 #include <openvpn/common/hash.hpp>
 #include <openvpn/addr/ip.hpp>
 
-namespace openvpn {
-namespace IP {
+namespace openvpn::IP {
 // Basic route object
 template <typename ADDR>
 class RouteType
@@ -433,8 +432,7 @@ inline Route route_from_string(const std::string &rtstr,
 
 #endif
 
-} // namespace IP
-} // namespace openvpn
+} // namespace openvpn::IP
 
 #ifdef USE_OPENVPN_HASH
 OPENVPN_HASH_METHOD(openvpn::IP::Route, hash_value);

diff --git a/openvpn/apple/cf/cf.hpp b/openvpn/apple/cf/cf.hpp
@@ -55,8 +55,7 @@
             return cls();                              \
     }
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 enum Rule
 {
     CREATE, // create rule
@@ -471,7 +470,6 @@ inline Data plist(CFTypeRef obj)
                                          nullptr));
 }
 
-} // namespace CF
-} // namespace openvpn
+} // namespace openvpn::CF
 
 #endif // OPENVPN_APPLECRYPTO_CF_CF_H
diff --git a/openvpn/apple/cf/cfhelper.hpp b/openvpn/apple/cf/cfhelper.hpp
@@ -29,8 +29,7 @@
 // defined in cf.hpp.  They add additional convenience methods, such as dictionary
 // lookup.
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 
 // essentially a vector of void *, used as source for array and dictionary constructors
 typedef BufferAllocatedType<CFTypeRef, thread_unsafe_refcount> SrcList;
@@ -256,6 +255,5 @@ inline void array_append_index(MutableArray &array, CFIndex value)
     Number num = number_from_index(value);
     arrayAppendValue(array(), num());
 }
-} // namespace CF
-} // namespace openvpn
+} // namespace openvpn::CF
 #endif
diff --git a/openvpn/apple/cf/cfhost.hpp b/openvpn/apple/cf/cfhost.hpp
@@ -24,10 +24,8 @@
 
 #include <openvpn/apple/cf/cf.hpp>
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 OPENVPN_CF_WRAP(Host, host_cast, CFHostRef, CFHostGetTypeID)
 }
-} // namespace openvpn
 
 #endif
diff --git a/openvpn/apple/cf/cfrunloop.hpp b/openvpn/apple/cf/cfrunloop.hpp
@@ -24,11 +24,9 @@
 
 #include <openvpn/apple/cf/cf.hpp>
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 OPENVPN_CF_WRAP(RunLoop, runloop_cast, CFRunLoopRef, CFRunLoopGetTypeID)
 OPENVPN_CF_WRAP(RunLoopSource, runloop_source_cast, CFRunLoopSourceRef, CFRunLoopSourceGetTypeID);
-} // namespace CF
-} // namespace openvpn
+} // namespace openvpn::CF
 
 #endif
diff --git a/openvpn/apple/cf/cfsec.hpp b/openvpn/apple/cf/cfsec.hpp
@@ -40,8 +40,7 @@
 
 // Define C++ wrappings for Apple security-related objects.
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 OPENVPN_CF_WRAP(Cert, cert_cast, SecCertificateRef, SecCertificateGetTypeID)
 OPENVPN_CF_WRAP(Key, key_cast, SecKeyRef, SecKeyGetTypeID)
 OPENVPN_CF_WRAP(Identity, identity_cast, SecIdentityRef, SecIdentityGetTypeID)
@@ -51,8 +50,7 @@ OPENVPN_CF_WRAP(Trust, trust_cast, SecTrustRef, SecTrustGetTypeID)
 OPENVPN_CF_WRAP(Keychain, keychain_cast, SecKeychainRef, SecKeychainGetTypeID)
 OPENVPN_CF_WRAP(Access, access_cast, SecAccessRef, SecAccessGetTypeID)
 #endif
-} // namespace CF
+} // namespace openvpn::CF
 
-} // namespace openvpn
 
 #endif // OPENVPN_APPLECRYPTO_CF_CFSEC_H
diff --git a/openvpn/apple/cf/cfsocket.hpp b/openvpn/apple/cf/cfsocket.hpp
@@ -24,10 +24,8 @@
 
 #include <openvpn/apple/cf/cf.hpp>
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 OPENVPN_CF_WRAP(Socket, socket_cast, CFSocketRef, CFSocketGetTypeID)
 }
-} // namespace openvpn
 
 #endif
diff --git a/openvpn/apple/cf/cfstream.hpp b/openvpn/apple/cf/cfstream.hpp
@@ -24,11 +24,9 @@
 
 #include <openvpn/apple/cf/cf.hpp>
 
-namespace openvpn {
-namespace CF {
+namespace openvpn::CF {
 OPENVPN_CF_WRAP(ReadStream, read_stream_cast, CFReadStreamRef, CFReadStreamGetTypeID)
 OPENVPN_CF_WRAP(WriteStream, write_stream_cast, CFWriteStreamRef, CFWriteStreamGetTypeID)
-} // namespace CF
-} // namespace openvpn
+} // namespace openvpn::CF
 
 #endif