HAND FIXES: Manual cleanup of namespaces

wpinet/robotpy_pybind_build_info.bzl

@@ -13,7 +13,7 @@ def wpinet_extension(srcs = [], header_to_dat_deps = [], extra_hdrs = [], includ
             header_file = "$(execpath :robotpy-native-wpinet.copy_headers)/wpi/net/PortForwarder.hpp",
             tmpl_class_names = [],
             trampolines = [
-                ("wpi::PortForwarder", "wpi__PortForwarder.hpp"),
+                ("wpi::net::PortForwarder", "wpi__net__PortForwarder.hpp"),
             ],
         ),
         struct(
@@ -23,7 +23,7 @@ def wpinet_extension(srcs = [], header_to_dat_deps = [], extra_hdrs = [], includ
             header_file = "$(execpath :robotpy-native-wpinet.copy_headers)/wpi/net/WebServer.hpp",
             tmpl_class_names = [],
             trampolines = [
-                ("wpi::WebServer", "wpi__WebServer.hpp"),
+                ("wpi::net::WebServer", "wpi__net__WebServer.hpp"),
             ],
         ),
     ]

wpinet/src/main/native/include/wpi/net/DsClient.hpp

@@ -10,10 +10,11 @@
 
 #include "wpi/util/Signal.h"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class Logger;
+}
 
+namespace wpi::net {
 namespace uv {
 class Loop;
 class Tcp;

wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp

@@ -12,9 +12,11 @@
 #include "wpi/net/HttpParser.hpp"
 #include "wpi/net/uv/Stream.hpp"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class raw_ostream;
+}
+
+namespace wpi::net {
 
 class HttpServerConnection {
  public:

wpinet/src/main/native/include/wpi/net/ParallelTcpConnector.hpp

@@ -15,10 +15,11 @@
 
 #include "wpi/net/uv/Timer.hpp"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class Logger;
+}
 
+namespace wpi::net {
 namespace uv {
 class GetAddrInfoReq;
 class Loop;

wpinet/src/main/native/include/wpi/net/UDPClient.hpp

@@ -12,10 +12,11 @@
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/mutex.hpp"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class Logger;
+}
 
+namespace wpi::net {
 class UDPClient {
   int m_lsd;
   int m_port;

wpinet/src/main/native/include/wpi/net/hostname.hpp

@@ -8,10 +8,12 @@
 #include <string>
 #include <string_view>
 
-namespace wpi::net {
+namespace wpi::util {
 template <typename T>
 class SmallVectorImpl;
+}
 
+namespace wpi::net {
 std::string GetHostname();
 std::string_view GetHostname(wpi::util::SmallVectorImpl<char>& name);
 }  // namespace wpi::net

wpinet/src/main/native/include/wpi/net/uv/Handle.hpp

@@ -18,7 +18,7 @@
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/util/Signal.h"
 
-namespace wpi::net {
+namespace wpi::util {
 class Logger;
 }  // namespace wpi::net
 

wpinet/src/main/native/macOS/ResolverThread.cpp

@@ -50,7 +50,7 @@ void ResolverThread::RemoveServiceRefInThread(DNSServiceRef serviceRef) {
 WPI_EventHandle ResolverThread::RemoveServiceRefOutsideThread(
     DNSServiceRef serviceRef) {
   std::scoped_lock lock{serviceRefMutex};
-  WPI_EventHandle handle = CreateEvent(true);
+  WPI_EventHandle handle = wpi::util::CreateEvent(true);
   serviceRefsToRemove.push_back({serviceRef, handle});
   return handle;
 }

wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPAcceptor.h

@@ -32,10 +32,11 @@
 #include "wpi/net/NetworkAcceptor.hpp"
 #include "wpi/net/TCPStream.h"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class Logger;
+}
 
+namespace wpi::net {
 class TCPAcceptor : public NetworkAcceptor {
   int m_lsd;
   int m_port;

wpinet/src/main/native/thirdparty/tcpsockets/include/wpi/net/TCPConnector.h

@@ -30,10 +30,11 @@
 
 #include "wpi/net/NetworkStream.hpp"
 
-namespace wpi::net {
-
+namespace wpi::util {
 class Logger;
+}
 
+namespace wpi::net {
 class TCPConnector {
  public:
   static std::unique_ptr<NetworkStream> connect(const char* server, int port,

wpinet/src/test/native/cpp/WorkerThreadTest.cpp

@@ -36,8 +36,8 @@ TEST(WorkerThreadTest, FutureVoid) {
 }
 
 TEST(WorkerThreadTest, Loop) {
-  mutex m;
-  condition_variable cv;
+  wpi::util::mutex m;
+  wpi::util::condition_variable cv;
   int callbacks = 0;
 
   WorkerThread<int(bool)> worker;
@@ -60,8 +60,8 @@ TEST(WorkerThreadTest, Loop) {
 }
 
 TEST(WorkerThreadTest, LoopVoid) {
-  mutex m;
-  condition_variable cv;
+  wpi::util::mutex m;
+  wpi::util::condition_variable cv;
   int callbacks = 0;
 
   WorkerThread<void(bool)> worker;