Massive update for dependencies including Catch2, Asio, and Connective C++ libraries

Author: cliffg-softwarelibre

CMakeLists.txt

@@ -30,7 +30,7 @@ add_library ( chops::chops_net_ip ALIAS chops_net_ip )
 # dependencies needed for main library
 
 include ( cmake/download_cpm.cmake )
-CPMAddPackage ( "gh:connectivecpp/shared-buffer@1.0.3" )
+CPMAddPackage ( "gh:connectivecpp/shared-buffer@1.0.4" )
 CPMAddPackage ( "gh:martinmoene/expected-lite@0.8.0" )
 
 include ( cmake/download_asio_cpm.cmake )

include/net_ip/detail/net_entity_common.hpp

@@ -17,7 +17,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2017-2019 by Cliff Green
+ *  Copyright (c) 2017-2025 by Cliff Green
  *
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -27,7 +27,7 @@
 #ifndef NET_ENTITY_COMMON_HPP_INCLUDED
 #define NET_ENTITY_COMMON_HPP_INCLUDED
 
-#include "asio/executor.hpp"
+#include "asio/any_io_executor.hpp"
 #include "asio/post.hpp"
 
 #include <atomic>
@@ -75,7 +75,7 @@ class net_entity_common {
 
   template <typename F1, typename F2, typename SF>
   std::error_code start(F1&& io_state_chg_func, F2&& err_func, 
-                        const asio::executor& exec,
+                        const asio::any_io_executor& exec,
                         SF&& start_func) {
     int expected = 0;
     if (!m_started.compare_exchange_strong(expected, 1)) {
@@ -95,7 +95,7 @@ class net_entity_common {
 
 
   template <typename SF>
-  std::error_code stop(const asio::executor& exec,
+  std::error_code stop(const asio::any_io_executor& exec,
                        SF&& stop_func) {
     int expected = 1;
     if (!m_started.compare_exchange_strong(expected, 2)) {

include/net_ip/detail/output_queue.hpp

@@ -7,14 +7,14 @@
  *  Concurrency protection is needed at a higher level to enforce data structure and flag
  *  consistency for data sending, as well as to ensure that only one write is in process at 
  *  a time. There are multiple ways to accomplish this goal, whether with locks (mutex or 
- *  spin-lock or semaphore, etc), or by posting all write operations through the Asio 
+ *  spin-lock or semaphore, etc), or by posting all write operations through the @c asio 
  *  executor.
  *
  *  @note For internal use only.
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2017-2019 by Cliff Green
+ *  Copyright (c) 2017-2025 by Cliff Green
  *
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

include/net_ip/detail/tcp_connector.hpp

@@ -8,7 +8,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
+ *  Copyright (c) 2018-2025 by Cliff Green
  *
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

include/net_ip/detail/tcp_io.hpp

@@ -19,7 +19,7 @@
 #define TCP_IO_HPP_INCLUDED
 
 #include "asio/io_context.hpp"
-#include "asio/executor.hpp"
+#include "asio/any_io_executor.hpp"
 #include "asio/read.hpp"
 #include "asio/read_until.hpp"
 #include "asio/write.hpp"

include/net_ip/net_ip.hpp

@@ -94,7 +94,10 @@ namespace net {
  *  other words, no event loop or @c run methods are available. Instead, the
  *  @c net_ip class takes an @c asio @c io_context as a constructor parameter and 
  *  application code will use the @c asio executor methods for invoking
- *  the underlying asynchronous operations.
+ *  the underlying asynchronous operations. The most current (as of early 2025)
+ *  @c asio executor class, matching the C++ 26 standard executor, is the @c asio 
+ *  @c any_io_executor class.
+ *
  *
  *  For convenience, a class named @c worker in the @c net_ip_component directory 
  *  combines an executor with a work guard and creates a thread to invoke the asynchronous 
@@ -391,13 +394,13 @@ class net_ip {
 // overloaded utility brought in from net_entity.hpp
     std::visit (detail::overloaded {
         [this] (detail::tcp_acceptor_weak_ptr p) { 
-          std::erase_if(m_acceptors, [p] (detail::tcp_acceptor_shared_ptr sp) { sp == p.lock(); } )
+          std::erase_if(m_acceptors, [p] (detail::tcp_acceptor_shared_ptr sp) { return sp == p.lock(); } );
 	},
         [this] (detail::tcp_connector_weak_ptr p) { 
-          std::erase_if(m_connectors, [p] (detail::tcp_connector_shared_ptr sp) { sp == p.lock(); } )
+          std::erase_if(m_connectors, [p] (detail::tcp_connector_shared_ptr sp) { return sp == p.lock(); } );
 	},
         [this] (detail::udp_entity_io_weak_ptr p) {
-          std::erase_if(m_udp_entities, [p] (detail::udp_entity_io_shared_ptr sp) { sp == p.lock(); } )
+          std::erase_if(m_udp_entities, [p] (detail::udp_entity_io_shared_ptr sp) { return sp == p.lock(); } );
 	}
       }, ent.m_wptr);
   }

include/net_ip_component/worker.hpp

@@ -9,7 +9,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2018 by Cliff Green
+ *  Copyright (c) 2018-2025 by Cliff Green
  *
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -25,7 +25,7 @@
 #include <iostream>
 
 #include "asio/io_context.hpp"
-#include "asio/executor.hpp"
+#include "asio/any_io_executor.hpp"
 #include "asio/executor_work_guard.hpp"
 
 namespace chops {

test/net_ip/basic_io_output_test.cpp

@@ -16,6 +16,7 @@
 #include <memory> // std::shared_ptr
 #include <set>
 #include <cstddef> // std::size_t
+#include <span>
 
 #include "net_ip/queue_stats.hpp"
 #include "net_ip/basic_io_interface.hpp"
@@ -56,7 +57,8 @@ void basic_io_output_test_sends() {
   REQUIRE ((*s).output_queue_size == chops::test::io_handler_mock::qs_base);
   REQUIRE ((*s).bytes_in_output_queue == (chops::test::io_handler_mock::qs_base + 1));
 
-  chops::const_shared_buffer buf(nullptr, 0);
+  std::byte b { 0x0 };
+  chops::const_shared_buffer buf(std::span<const std::byte>(&b, 0u));
   using endp_t = typename IOT::endpoint_type;
 
   REQUIRE (io_out.is_valid());

test/net_ip/detail/io_common_test.cpp

@@ -21,6 +21,7 @@
 #include <chrono>
 #include <functional> // std::cref, std::ref
 #include <cstddef> // std::size_t
+#include <ranges> // std::views::iota
 
 #include "net_ip/detail/io_common.hpp"
 
@@ -103,14 +104,14 @@ template <typename E>
 std::size_t start_writes(const std::vector<E>& data_vec, 
                          chops::net::detail::io_common<E>& io_comm,
                          int multiplier, int wait_offset) {
-  chops::repeat(multiplier, [&data_vec, &io_comm, wait_offset] {
-      for (const auto& e : data_vec) {
-        auto r = io_comm.start_write(e, empty_write_func<E>);
-        assert (r != chops::net::detail::io_common<E>::write_status::io_stopped);
-      }
-      std::this_thread::sleep_for(std::chrono::milliseconds(Wait+wait_offset));
-      assert (io_comm.is_io_started());
-  } );
+  for (int i : std::views::iota(0, multiplier)) {
+    for (const auto& e : data_vec) {
+      auto r = io_comm.start_write(e, empty_write_func<E>);
+      assert (r != chops::net::detail::io_common<E>::write_status::io_stopped);
+    }
+    std::this_thread::sleep_for(std::chrono::milliseconds(Wait+wait_offset));
+    assert (io_comm.is_io_started());
+  }
   return data_vec.size() * multiplier;
 }
 
@@ -132,11 +133,11 @@ void io_common_stress_test(const std::vector<E>& data_vec, int multiplier, int n
 
   std::vector<std::future<std::size_t>> futs;
 
-  chops::repeat(num_thrs, [&iocommon, multiplier, &data_vec, &futs] (int i) {
+  for (int i : std::views::iota(0, num_thrs)) {
     futs.push_back(std::async(std::launch::async, start_writes<E>,
                               std::cref(data_vec), std::ref(iocommon),
                               multiplier, 2*i));
-  } );
+  }
 
   std::size_t tot = 0u;
   for (auto& fut : futs) {
@@ -149,10 +150,10 @@ void io_common_stress_test(const std::vector<E>& data_vec, int multiplier, int n
 
   futs.clear();
 
-  chops::repeat(num_thrs, [&iocommon, &data_vec, &futs] {
+  for (int i : std::views::iota(0, num_thrs)) {
     futs.push_back(std::async(std::launch::async, write_next_elems<E>,
                               std::cref(data_vec), std::ref(iocommon)));
-  } );
+  }
 
   for (auto& fut : futs) {
     tot += fut.get(); // join threads

test/net_ip/detail/output_queue_test.cpp

@@ -15,6 +15,7 @@
 
 #include <vector>
 #include <cassert>
+#include <ranges> // std::views::iota
 
 #include "net_ip/detail/output_queue.hpp"
 
@@ -26,11 +27,11 @@ template <typename E>
 std::size_t add_to_q(const std::vector<E>& data_vec, 
                      chops::net::detail::output_queue<E>& outq,
                      int multiplier) {
-  chops::repeat(multiplier, [&data_vec, &outq] {
-      for (const auto& i : data_vec) {
-        outq.add_element(i);
-      }
-  } );
+  for (int i : std::views::iota(0, multiplier)) {
+    for (const auto& j : data_vec) {
+      outq.add_element(j);
+    }
+  }
   return data_vec.size() * multiplier;
 }
 
@@ -46,12 +47,11 @@ void output_queue_test(const std::vector<E>& data_vec, int multiplier) {
   REQUIRE (qs.output_queue_size == tot);
   REQUIRE (qs.bytes_in_output_queue == chops::test::accum_io_buf_size(data_vec) * multiplier);
 
-  chops::repeat(static_cast<int>(tot), [&outq] {
-      auto e = outq.get_next_element();
-//      REQUIRE (e);
-      assert (e);
-    }
-  );
+  for (int i : std::views::iota(0, static_cast<int>(tot))) {
+    auto e = outq.get_next_element();
+//    REQUIRE (e);
+    assert (e);
+  }
   auto e = outq.get_next_element(); // should be empty optional
   REQUIRE_FALSE (e); // no element val available
   qs = outq.get_queue_stats();