diff --git a/3rd/ucoro/include/ucoro/asio_glue.hpp b/3rd/ucoro/include/ucoro/asio_glue.hpp index 172e731..a5d3dd6 100644 --- a/3rd/ucoro/include/ucoro/asio_glue.hpp +++ b/3rd/ucoro/include/ucoro/asio_glue.hpp @@ -17,7 +17,7 @@ #include #include -namespace pscoro::asio_glue +namespace ucoro::asio_glue { template struct asio_awaitable_state @@ -64,7 +64,7 @@ namespace pscoro::asio_glue { boost::asio::any_io_executor executor; - if constexpr (pscoro::concepts::awaitable_promise_type) + if constexpr (ucoro::concepts::awaitable_promise_type) { if (continue_handle.promise().local_) { @@ -139,13 +139,13 @@ namespace pscoro::asio_glue struct initiate_do_invoke_ucoro_awaitable { template - void operator()(Handler&& handler, pscoro::awaitable ucoro_awaitable) const + void operator()(Handler&& handler, ucoro::awaitable ucoro_awaitable) const { auto executor = boost::asio::get_associated_executor(handler); if constexpr (std::is_void_v) { - auto task = [handler = std::move(handler), ucoro_awaitable = std::move(ucoro_awaitable)]() mutable -> pscoro::awaitable + auto task = [handler = std::move(handler), ucoro_awaitable = std::move(ucoro_awaitable)]() mutable -> ucoro::awaitable { try { @@ -162,7 +162,7 @@ namespace pscoro::asio_glue } else { - auto task = [handler = std::move(handler), ucoro_awaitable = std::move(ucoro_awaitable)]() mutable -> pscoro::awaitable + auto task = [handler = std::move(handler), ucoro_awaitable = std::move(ucoro_awaitable)]() mutable -> ucoro::awaitable { try { @@ -181,14 +181,14 @@ namespace pscoro::asio_glue }; template - auto to_asio_awaitable(pscoro::awaitable&& ucoro_awaitable) + auto to_asio_awaitable(ucoro::awaitable&& ucoro_awaitable) { return boost::asio::async_initiate( initiate_do_invoke_ucoro_awaitable{}, boost::asio::use_awaitable, std::move(ucoro_awaitable)); } template<> - inline auto to_asio_awaitable(pscoro::awaitable&& ucoro_awaitable) + inline auto to_asio_awaitable(ucoro::awaitable&& ucoro_awaitable) { return boost::asio::async_initiate( initiate_do_invoke_ucoro_awaitable{}, boost::asio::use_awaitable, std::move(ucoro_awaitable)); @@ -197,10 +197,10 @@ namespace pscoro::asio_glue } // namespace ucoro::asio_glue template -struct pscoro::await_transformer> +struct ucoro::await_transformer> { static auto await_transform(boost::asio::awaitable&& asio_awaitable) { - return pscoro::asio_glue::asio_awaitable_awaiter{std::move(asio_awaitable)}; + return ucoro::asio_glue::asio_awaitable_awaiter{std::move(asio_awaitable)}; } }; diff --git a/main.cmake b/main.cmake index 24880a7..585b4ce 100644 --- a/main.cmake +++ b/main.cmake @@ -213,8 +213,10 @@ target_link_libraries(Core_exe PRIVATE Core_Static) - -#add_subdirectory(${core_3rd}/ucoro/ucoro ${CMAKE_BINARY_DIR}/ucoro) +set(ucoro_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/3rd/ucoro/include/ucoro") +if(EXISTS "${ucoro_cmake_dir}/CMakeLists.txt") + add_subdirectory("${ucoro_cmake_dir}" "${CMAKE_BINARY_DIR}/ucoro") +endif() #include(${CMAKE_CURRENT_LIST_DIR}/learn_coro_code/main.cmake) @@ -239,4 +241,4 @@ target_link_libraries(Core_exe PRIVATE Core_Static) # "ON" # "30" #) -#message("2222222222222") \ No newline at end of file +#message("2222222222222")