Merge recent master

JDRaftKeeper · Jan 4, 2024 · 69708e6 · 69708e6
1 parent 1afefe5
commit 69708e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Common/NIO/SocketAcceptor.h b/src/Common/NIO/SocketAcceptor.h
@@ -22,8 +22,8 @@
 namespace RK
 {
 
-using Poco::Net::ServerSocket;
 using Poco::Net::Socket;
+using Poco::Net::ServerSocket;
 using Poco::Net::StreamSocket;
 
 /// This class implements the Acceptor part of the Acceptor-Connector design pattern.

diff --git a/src/Common/NIO/SocketReactor.h b/src/Common/NIO/SocketReactor.h
@@ -18,6 +18,7 @@
 #include <Common/NIO/SocketNotification.h>
 #include <Common/NIO/SocketNotifier.h>
 #include <Common/setThreadName.h>
+#include <common/types.h>
 
 
 using Poco::Net::Socket;
@@ -160,8 +161,8 @@ class SocketReactor : public Poco::Runnable
 class AsyncSocketReactor : public SocketReactor
 {
 public:
-    explicit AsyncSocketReactor(const std::string & name = "");
-    explicit AsyncSocketReactor(const Poco::Timespan & timeout, const std::string & name = "");
+    explicit AsyncSocketReactor(const String & name = "");
+    explicit AsyncSocketReactor(const Poco::Timespan & timeout, const String & name = "");
 
     ~AsyncSocketReactor() override;
 
@@ -174,7 +175,7 @@ class AsyncSocketReactor : public SocketReactor
     void startup();
 
     Poco::Thread thread;
-    const std::string name;
+    const String name;
 };
 
 

diff --git a/src/Common/NIO/SvsSocketReactor.h b/src/Common/NIO/SvsSocketReactor.h