Try fix build error

SoftFever · Mar 17, 2024 · 45df4ed · 45df4ed
1 parent d28e517
commit 45df4ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp
@@ -31,7 +31,7 @@ void session::start()
 void session::stop()
 {
     boost::system::error_code ignored_ec;
-    socket.shutdown(socket_base::shutdown_both, ignored_ec);
+    socket.shutdown(boost::asio::socket_base::shutdown_both, ignored_ec);
     socket.close(ignored_ec);
 }
 
@@ -47,7 +47,7 @@ void session::read_first_line()
             std::getline(stream, ignore, '\n');
             headers.on_read_request_line(line);
             read_next_line();
-        } else if (e != error::operation_aborted) {
+        } else if (e != boost::asio::error::operation_aborted) {
             server.stop(self);
         }
     });
@@ -59,7 +59,7 @@ void session::read_body()
 
     int                                nbuffer = 1000;
     std::shared_ptr<std::vector<char>> bufptr  = std::make_shared<std::vector<char>>(nbuffer);
-    async_read(socket, buffer(*bufptr, nbuffer),
+    async_read(socket, boost::asio::buffer(*bufptr, nbuffer),
                [this, self](const boost::beast::error_code& e, std::size_t s) { server.stop(self); });
 }
 
@@ -82,7 +82,8 @@ void session::read_next_line()
                     std::stringstream ssOut;
                     resp->write_response(ssOut);
                     std::shared_ptr<std::string> str = std::make_shared<std::string>(ssOut.str());
-                    async_write(socket, buffer(str->c_str(), str->length()), [this, self](const boost::beast::error_code& e, std::size_t s) {
+                    async_write(socket, boost::asio::buffer(str->c_str(), str->length()),
+                                [this, self](const boost::beast::error_code& e, std::size_t s) {
                         std::cout << "done" << std::endl;
                         server.stop(self);
                     });
@@ -92,15 +93,15 @@ void session::read_next_line()
             } else {
                 read_next_line();
             }
-        } else if (e != error::operation_aborted) {
+        } else if (e != boost::asio::error::operation_aborted) {
             server.stop(self);
         }
     });
 }
 
 void HttpServer::IOServer::do_accept()
 {
-    acceptor.async_accept([this](boost::system::error_code ec, ip::tcp::socket socket) {
+    acceptor.async_accept([this](boost::system::error_code ec, boost::asio::ip::tcp::socket socket) {
         if (!acceptor.is_open()) {
             return;
         }
@@ -135,7 +136,7 @@ void HttpServer::IOServer::stop_all()
 }
 
 
-HttpServer::HttpServer(ip::port_type port) : port(port) {}
+HttpServer::HttpServer(boost::asio::ip::port_type port) : port(port) {}
 
 void HttpServer::start()
 {

diff --git a/src/slic3r/GUI/HttpServer.hpp b/src/slic3r/GUI/HttpServer.hpp
@@ -13,9 +13,6 @@
 #include <string>
 #include <memory>
 
-using namespace boost::system;
-using namespace boost::asio;
-
 #define LOCALHOST_PORT      13618
 #define LOCALHOST_URL       "http://localhost:"
 
@@ -72,7 +69,7 @@ class http_headers
 
 class HttpServer
 {
-    ip::port_type port;
+    boost::asio::ip::port_type port;
 
 public:
     class Response
@@ -99,7 +96,7 @@ class HttpServer
         void write_response(std::stringstream& ssOut) override;
     };
 
-    HttpServer(ip::port_type port = LOCALHOST_PORT);
+    HttpServer(boost::asio::ip::port_type port = LOCALHOST_PORT);
 
     boost::thread m_http_server_thread;
     bool          start_http_server = false;
@@ -116,11 +113,11 @@ class HttpServer
     {
     public:
         HttpServer&                        server;
-        io_service                         io_service;
-        ip::tcp::acceptor                  acceptor;
+        boost::asio::io_service            io_service;
+        boost::asio::ip::tcp::acceptor     acceptor;
         std::set<std::shared_ptr<session>> sessions;
 
-        IOServer(HttpServer& server) : server(server), acceptor(io_service, {ip::tcp::v4(), server.port}) {}
+        IOServer(HttpServer& server) : server(server), acceptor(io_service, {boost::asio::ip::tcp::v4(), server.port}) {}
 
         void do_accept();
 
@@ -138,7 +135,7 @@ class HttpServer
 class session : public std::enable_shared_from_this<session>
 {
     HttpServer::IOServer& server;
-    ip::tcp::socket       socket;
+    boost::asio::ip::tcp::socket socket;
 
     boost::asio::streambuf buff;
     http_headers headers;
@@ -148,7 +145,7 @@ class session : public std::enable_shared_from_this<session>
     void read_body();
 
 public:
-    session(HttpServer::IOServer& server, ip::tcp::socket socket) : server(server), socket(std::move(socket)) {}
+    session(HttpServer::IOServer& server, boost::asio::ip::tcp::socket socket) : server(server), socket(std::move(socket)) {}
 
     void start();
     void stop();

diff --git a/src/slic3r/Utils/SimplyPrint.cpp b/src/slic3r/Utils/SimplyPrint.cpp
@@ -10,7 +10,7 @@
 
 namespace Slic3r {
 
-static constexpr ip::port_type CALLBACK_PORT = 21328;
+static constexpr boost::asio::ip::port_type CALLBACK_PORT         = 21328;
 static const std::string CALLBACK_URL = "http://localhost:21328/callback";
 static const std::string RESPONSE_TYPE  = "code";
 static const std::string CLIENT_ID = "simplyprintorcaslicer";