Merge branch 'main' of https://github.com/nanocoh/naja

najaeda · Jan 6, 2025 · 8f5cc76 · 8f5cc76
2 parents 3701bd1 + 14785e0
commit 8f5cc76
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/snl/snl/serialization/capnp/SNLCapnP.cpp b/src/snl/snl/serialization/capnp/SNLCapnP.cpp
@@ -24,10 +24,10 @@ void SNLCapnP::send(const SNLDB* db, const std::string& ipAddress, uint16_t port
 }
 
 void SNLCapnP::send(const SNLDB* db, const std::string& ipAddress, uint16_t port, SNLID::DBID forceDBID) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //socket creation
-  tcp::socket socket(io_service);
-  socket.connect(tcp::endpoint(boost::asio::ip::address::from_string(ipAddress), port));
+  tcp::socket socket(ioContext);
+  socket.connect(tcp::endpoint(boost::asio::ip::make_address(ipAddress), port));
   sendInterface(db, socket, forceDBID);
   sendImplementation(db, socket, forceDBID);
 }
@@ -42,11 +42,11 @@ SNLDB* SNLCapnP::load(const std::filesystem::path& path) {
 //Need to find a proper way to test serialization on the wire
 //LCOV_EXCL_START
 boost::asio::ip::tcp::socket SNLCapnP::getSocket(uint16_t port) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //listen for new connection
-  tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v4(), port));
+  tcp::acceptor acceptor(ioContext, tcp::endpoint(tcp::v4(), port));
   //socket creation 
-  tcp::socket socket(io_service);
+  tcp::socket socket(ioContext);
   //waiting for connection
   acceptor.accept(socket);
   return std::move(socket);

diff --git a/src/snl/snl/serialization/capnp/SNLCapnPImplementation.cpp b/src/snl/snl/serialization/capnp/SNLCapnPImplementation.cpp
@@ -511,10 +511,10 @@ void SNLCapnP::sendImplementation(
   const SNLDB* db,
   const std::string& ipAddress,
   uint16_t port) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //socket creation
-  tcp::socket socket(io_service);
-  socket.connect(tcp::endpoint(boost::asio::ip::address::from_string(ipAddress), port));
+  tcp::socket socket(ioContext);
+  socket.connect(tcp::endpoint(boost::asio::ip::make_address(ipAddress), port));
   sendImplementation(db, socket);
 }
 //LCOV_EXCL_STOP
@@ -555,11 +555,11 @@ SNLDB* SNLCapnP::receiveImplementation(tcp::socket& socket) {
 }
 
 SNLDB* SNLCapnP::receiveImplementation(uint16_t port) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //listen for new connection
-  tcp::acceptor acceptor_(io_service, tcp::endpoint(tcp::v4(), port));
+  tcp::acceptor acceptor_(ioContext, tcp::endpoint(tcp::v4(), port));
   //socket creation 
-  tcp::socket socket(io_service);
+  tcp::socket socket(ioContext);
   //waiting for connection
   acceptor_.accept(socket);
   SNLDB* db = receiveImplementation(socket);

diff --git a/src/snl/snl/serialization/capnp/SNLCapnPInterface.cpp b/src/snl/snl/serialization/capnp/SNLCapnPInterface.cpp
@@ -438,10 +438,10 @@ void SNLCapnP::sendInterface(
   const SNLDB* db,
   const std::string& ipAddress,
   uint16_t port) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //socket creation
-  tcp::socket socket(io_service);
-  socket.connect(tcp::endpoint( boost::asio::ip::address::from_string(ipAddress), port));
+  tcp::socket socket(ioContext);
+  socket.connect(tcp::endpoint(boost::asio::ip::make_address(ipAddress), port));
   sendInterface(db, socket);
 }
 //LCOV_EXCL_STOP
@@ -502,11 +502,11 @@ SNLDB* SNLCapnP::receiveInterface(tcp::socket& socket) {
 
 //LCOV_EXCL_START
 SNLDB* SNLCapnP::receiveInterface(uint16_t port) {
-  boost::asio::io_service io_service;
+  boost::asio::io_context ioContext;
   //listen for new connection
-  tcp::acceptor acceptor_(io_service, tcp::endpoint(tcp::v4(), port));
+  tcp::acceptor acceptor_(ioContext, tcp::endpoint(tcp::v4(), port));
   //socket creation 
-  tcp::socket socket(io_service);
+  tcp::socket socket(ioContext);
   //waiting for connection
   acceptor_.accept(socket);
   SNLDB* db = receiveInterface(socket);

diff --git a/thirdparty/cpptrace b/thirdparty/cpptrace
+8 −3		.github/workflows/test.yml
+12 −0		CHANGELOG.md
+6 −1		CMakeLists.txt
+11 −9		README.md
+1 −1		ci/setup-prerequisites-mingw.ps1
+2 −2		ci/setup-prerequisites-unittest-macos.sh
+2 −2		ci/setup-prerequisites-unittest.sh
+1 −1		ci/setup-prerequisites.sh
+0 −13		ci/unittest.py
+22 −2		ci/util.py
+1 −0		cmake/InstallRules.cmake
+2 −2		cmake/OptionVariables.cmake
+11 −0		cmake/in/version-hpp.in
+46 −47		src/utils/microfmt.hpp
+1 −0		test/CMakeLists.txt
+1 −0		test/demo.cpp
+8 −0		test/unit/main.cpp