guard coroutine code with BOOST_CAPY_HAS_CORO

Author: ashtum

.github/workflows/ci.yml

@@ -865,9 +865,9 @@ jobs:
       - name: Clone Boost.Http.Proto
         uses: actions/checkout@v3
         with:
-          repository: cppalliance/http_proto
+          repository: ashtum/http_proto
           path: http-proto-root
-          ref: develop
+          ref: fix-symbol-visibility
 
       - name: Clone Boost.Buffers
         uses: actions/checkout@v3

example/client/burl/CMakeLists.txt

@@ -7,6 +7,10 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
+if(NOT cxx_std_20 IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    return()
+endif()
+
 file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp
     CMakeLists.txt
     Jamfile)

example/client/burl/multipart_form.cpp

@@ -11,12 +11,13 @@
 
 #include <boost/buffers/copy.hpp>
 #include <boost/buffers/slice.hpp>
-#include <boost/http_proto/file.hpp>
+#include <boost/capy/file.hpp>
 #include <boost/system/system_error.hpp>
 
 #include <filesystem>
 #include <random>
 
+namespace capy     = boost::capy;
 namespace core     = boost::core;
 namespace fs       = std::filesystem;
 using system_error = boost::system::system_error;
@@ -171,9 +172,9 @@ multipart_form::source::on_read(buffers::mutable_buffer mb)
 
     auto read = [&](const std::string& path, uint64_t size)
     {
-        http_proto::file file;
+        capy::file file;
 
-        file.open(path.c_str(), http_proto::file_mode::read, rs.ec);
+        file.open(path.c_str(), capy::file_mode::read, rs.ec);
         if(rs.ec)
             return false;
 

example/client/jsonrpc/CMakeLists.txt

@@ -7,6 +7,10 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
+if(NOT cxx_std_20 IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    return()
+endif()
+
 file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp
     CMakeLists.txt
     Jamfile)

example/cpp20/co_spawn/CMakeLists.txt

@@ -7,6 +7,10 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
+if(NOT cxx_std_20 IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+    return()
+endif()
+
 file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp
     CMakeLists.txt
     Jamfile)

example/cpp20/co_spawn/Jamfile

@@ -7,6 +7,8 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
+import config : requires ;
+
 using openssl ;
 import ac ;
 
@@ -32,4 +34,8 @@ project
 
 exe get :
     [ glob *.cpp ]
+    : requirements
+      [ requires
+        cxx20_hdr_coroutine
+      ]
     ;

example/server/Jamfile

@@ -20,6 +20,7 @@ project
     : requirements
       <library>/boost/beast2//boost_beast2
       <library>/boost/url//boost_url
+      <library>/boost/json//boost_json
       [ ac.check-library /boost/capy//boost_capy_zlib : <library>/boost/capy//boost_capy_zlib : ]
       [ ac.check-library /boost/capy//boost_capy_brotli : <library>/boost/capy//boost_capy_brotli : ]
       [ ac.check-library /openssl//ssl : <library>/openssl//ssl/<link>shared : <build>no ]

example/server/main.cpp

@@ -136,13 +136,15 @@ struct do_json_rpc
     }
 };
 
+#ifdef BOOST_CAPY_HAS_CORO
 auto
 do_request(
     http::route_params& rp) ->
         capy::task<http::route_result>
 {
     co_return http::route::next;
 }
+#endif
 
 int server_main( int argc, char* argv[] )
 {
@@ -168,7 +170,9 @@ int server_main( int argc, char* argv[] )
         http::cors_options opts;
         opts.allowedHeaders = "Content-Type";
 
+#ifdef BOOST_CAPY_HAS_CORO
         srv.wwwroot.use( http::co_route( do_request ) );
+#endif
 
         srv.wwwroot.use("/rpc",
             http::cors(opts),
@@ -178,7 +182,7 @@ int server_main( int argc, char* argv[] )
             {
                 if(rp.parser.is_complete())
                 {
-                    auto s = rp.parser.body();
+                    // auto s = rp.parser.body();
                     return http::route::next;
                 }
                 return http::route::next;

include/boost/beast2/server/route_handler_asio.hpp

@@ -39,6 +39,7 @@ class asio_route_params
     }
 
 private:
+#ifdef BOOST_CAPY_HAS_CORO
     auto
     spawn(
         capy::task<http::route_result> t) ->
@@ -63,6 +64,7 @@ class asio_route_params
                     });
             });
     }
+#endif
 
     void do_post() override;
 };

include/boost/beast2/spawn.hpp

@@ -10,8 +10,11 @@
 #ifndef BOOST_BEAST2_SPAWN_HPP
 #define BOOST_BEAST2_SPAWN_HPP
 
-#include <boost/beast2/detail/config.hpp>
 #include <boost/capy/task.hpp>
+
+#ifdef BOOST_CAPY_HAS_CORO
+
+#include <boost/beast2/detail/config.hpp>
 #include <boost/asio/co_spawn.hpp>
 #include <boost/asio/detached.hpp>
 #include <boost/asio/any_io_executor.hpp>
@@ -78,3 +81,5 @@ auto spawn(
 } // boost
 
 #endif
+
+#endif