core: inline socket_factory::create()

deniskovalchuk · Apr 7, 2024 · 54ddda2 · 54ddda2
1 parent a64086f
commit 54ddda2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 84 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,6 @@ set(sources
         include/ftp/detail/net_utils.hpp
         include/ftp/detail/socket.hpp
         include/ftp/detail/socket_base.hpp
-        include/ftp/detail/socket_factory.hpp
         include/ftp/detail/ssl_socket.hpp
         include/ftp/detail/utils.hpp
         include/ftp/stream/input_stream.hpp
@@ -59,7 +58,6 @@ set(sources
         src/replies.cpp
         src/reply.cpp
         src/socket.cpp
-        src/socket_factory.cpp
         src/ssl_socket.cpp
         src/utils.cpp)
 

diff --git a/include/ftp/detail/socket_factory.hpp b/include/ftp/detail/socket_factory.hpp
diff --git a/src/control_connection.cpp b/src/control_connection.cpp
@@ -24,7 +24,6 @@
 
 #include <ftp/ftp_exception.hpp>
 #include <ftp/detail/control_connection.hpp>
-#include <ftp/detail/socket_factory.hpp>
 #include <ftp/detail/socket.hpp>
 #include <ftp/detail/ssl_socket.hpp>
 #include <ftp/detail/utils.hpp>
@@ -44,7 +43,7 @@ static bool try_parse_status_code(std::string_view line, std::uint16_t & status_
 
 control_connection::control_connection(net_context & net_context)
 {
-    socket_ = socket_factory::create(net_context.get_io_context());
+    socket_ = std::make_unique<socket>(net_context.get_io_context());
 }
 
 void control_connection::connect(std::string_view hostname, std::uint16_t port)

diff --git a/src/data_connection.cpp b/src/data_connection.cpp
@@ -23,7 +23,7 @@
  */
 
 #include <ftp/detail/data_connection.hpp>
-#include <ftp/detail/socket_factory.hpp>
+#include <ftp/detail/socket.hpp>
 #include <ftp/ftp_exception.hpp>
 #include <array>
 
@@ -33,7 +33,7 @@ namespace ftp::detail
 data_connection::data_connection(net_context & net_context)
     : acceptor_(net_context.get_io_context())
 {
-    socket_ = socket_factory::create(net_context.get_io_context());
+    socket_ = std::make_unique<socket>(net_context.get_io_context());
 }
 
 void data_connection::connect(std::string_view ip, std::uint16_t port)

diff --git a/src/socket_factory.cpp b/src/socket_factory.cpp