From: =?utf-8?q?Timo_R=C3=B6hling?= Date: Mon, 9 Mar 2026 12:53:41 +0100 Subject: Boost 1.90 compatibility --- CMakeLists.txt | 2 +- src/cpp/flann/mpi/client.h | 9 ++++----- src/cpp/flann/mpi/flann_mpi_client.cpp | 1 + src/cpp/flann/mpi/server.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a68d929..64e836d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,7 +113,7 @@ endif(USE_MPI) if (USE_MPI AND HDF5_IS_PARALLEL) - find_package(Boost COMPONENTS mpi system serialization thread REQUIRED) + find_package(Boost COMPONENTS mpi serialization thread OPTIONAL_COMPONENTS system REQUIRED) include_directories(${Boost_INCLUDE_DIRS}) add_definitions("-DHAVE_MPI") endif() diff --git a/src/cpp/flann/mpi/client.h b/src/cpp/flann/mpi/client.h index 19a410c..686df15 100644 --- a/src/cpp/flann/mpi/client.h +++ b/src/cpp/flann/mpi/client.h @@ -46,8 +46,7 @@ public: Client(const std::string& host, const std::string& service) { tcp::resolver resolver(io_service_); - tcp::resolver::query query(tcp::v4(), host, service); - iterator_ = resolver.resolve(query); + results_ = resolver.resolve(tcp::v4(), host, service); } @@ -55,7 +54,7 @@ public: void knnSearch(const flann::Matrix& queries, flann::Matrix& indices, flann::Matrix& dists, int knn, const SearchParams& params) { tcp::socket sock(io_service_); - sock.connect(*iterator_); + sock.connect(*results_.begin()); Request req; req.nn = knn; @@ -78,8 +77,8 @@ public: private: - boost::asio::io_service io_service_; - tcp::resolver::iterator iterator_; + boost::asio::io_context io_service_; + tcp::resolver::results_type results_; }; diff --git a/src/cpp/flann/mpi/flann_mpi_client.cpp b/src/cpp/flann/mpi/flann_mpi_client.cpp index 1ac0fbd..728afd7 100644 --- a/src/cpp/flann/mpi/flann_mpi_client.cpp +++ b/src/cpp/flann/mpi/flann_mpi_client.cpp @@ -6,6 +6,7 @@ #include #include #include +#include diff --git a/src/cpp/flann/mpi/server.h b/src/cpp/flann/mpi/server.h index 2caab43..9d10280 100644 --- a/src/cpp/flann/mpi/server.h +++ b/src/cpp/flann/mpi/server.h @@ -119,11 +119,11 @@ public: void run() { boost::mpi::communicator world; - boost::shared_ptr io_service; + boost::shared_ptr io_service; boost::shared_ptr acceptor; if (world.rank()==0) { - io_service.reset(new boost::asio::io_service()); + io_service.reset(new boost::asio::io_context()); acceptor.reset(new tcp::acceptor(*io_service, tcp::endpoint(tcp::v4(), port_))); std::cout << "Start listening for queries...\n"; }