diff --git a/MyBot/dependencies/32/debug/bin/dpp.dll b/MyBot/dependencies/32/debug/bin/dpp.dll index f1a780f9..94853c8b 100644 Binary files a/MyBot/dependencies/32/debug/bin/dpp.dll and b/MyBot/dependencies/32/debug/bin/dpp.dll differ diff --git a/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp.cmake b/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp.cmake index a62d364d..e050ddb3 100644 --- a/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp.cmake +++ b/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp.cmake @@ -59,7 +59,6 @@ endif() add_library(dpp::dpp SHARED IMPORTED) set_target_properties(dpp::dpp PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "DPP_CORO" INTERFACE_COMPILE_FEATURES "cxx_std_17;cxx_std_20" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.1" INTERFACE_LINK_LIBRARIES "D:/a/DPP/DPP/main/win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib;D:/a/DPP/DPP/main/win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib" diff --git a/MyBot/dependencies/32/release/bin/dpp.dll b/MyBot/dependencies/32/release/bin/dpp.dll index 6ee585ac..7775cdea 100644 Binary files a/MyBot/dependencies/32/release/bin/dpp.dll and b/MyBot/dependencies/32/release/bin/dpp.dll differ diff --git a/MyBot/dependencies/32/release/lib/cmake/dpp/dpp.cmake b/MyBot/dependencies/32/release/lib/cmake/dpp/dpp.cmake index a62d364d..e050ddb3 100644 --- a/MyBot/dependencies/32/release/lib/cmake/dpp/dpp.cmake +++ b/MyBot/dependencies/32/release/lib/cmake/dpp/dpp.cmake @@ -59,7 +59,6 @@ endif() add_library(dpp::dpp SHARED IMPORTED) set_target_properties(dpp::dpp PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "DPP_CORO" INTERFACE_COMPILE_FEATURES "cxx_std_17;cxx_std_20" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.1" INTERFACE_LINK_LIBRARIES "D:/a/DPP/DPP/main/win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib;D:/a/DPP/DPP/main/win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/32/lib/zlib.lib;D:/a/DPP/DPP/main/win32/32/lib/opus.lib" diff --git a/MyBot/dependencies/64/debug/bin/dpp.dll b/MyBot/dependencies/64/debug/bin/dpp.dll index 5138bb6e..bb059b8a 100644 Binary files a/MyBot/dependencies/64/debug/bin/dpp.dll and b/MyBot/dependencies/64/debug/bin/dpp.dll differ diff --git a/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp.cmake b/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp.cmake index 0b8c7a2b..5fce4035 100644 --- a/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp.cmake +++ b/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp.cmake @@ -59,7 +59,6 @@ endif() add_library(dpp::dpp SHARED IMPORTED) set_target_properties(dpp::dpp PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "DPP_CORO" INTERFACE_COMPILE_FEATURES "cxx_std_17;cxx_std_20" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.1" INTERFACE_LINK_LIBRARIES "D:/a/DPP/DPP/main/library/../win32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/lib/zlib.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/lib/zlib.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib" diff --git a/MyBot/dependencies/64/release/bin/dpp.dll b/MyBot/dependencies/64/release/bin/dpp.dll index 14633f82..ced4b381 100644 Binary files a/MyBot/dependencies/64/release/bin/dpp.dll and b/MyBot/dependencies/64/release/bin/dpp.dll differ diff --git a/MyBot/dependencies/64/release/lib/cmake/dpp/dpp.cmake b/MyBot/dependencies/64/release/lib/cmake/dpp/dpp.cmake index 0b8c7a2b..5fce4035 100644 --- a/MyBot/dependencies/64/release/lib/cmake/dpp/dpp.cmake +++ b/MyBot/dependencies/64/release/lib/cmake/dpp/dpp.cmake @@ -59,7 +59,6 @@ endif() add_library(dpp::dpp SHARED IMPORTED) set_target_properties(dpp::dpp PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "DPP_CORO" INTERFACE_COMPILE_FEATURES "cxx_std_17;cxx_std_20" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/dpp-10.1" INTERFACE_LINK_LIBRARIES "D:/a/DPP/DPP/main/library/../win32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/lib/zlib.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/lib/libssl.lib;D:/a/DPP/DPP/main/library/../win32/lib/libcrypto.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib;D:/a/DPP/DPP/main/library/../win32/lib/zlib.lib;D:/a/DPP/DPP/main/library/../win32/lib/opus.lib" diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/cluster.h b/MyBot/dependencies/include/dpp-10.1/dpp/cluster.h index 283d622a..35fd8f81 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/cluster.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/cluster.h @@ -157,7 +157,7 @@ class DPP_EXPORT cluster { */ using slashcommand_handler_t = std::function; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Typedef for coroutines based slashcommand handler type */ @@ -445,7 +445,7 @@ class DPP_EXPORT cluster { */ timer start_timer(timer_callback_t on_tick, uint64_t frequency, timer_callback_t on_stop = {}); -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Start a coroutine timer. Every `frequency` seconds, the callback is called. * @@ -481,7 +481,7 @@ class DPP_EXPORT cluster { */ bool stop_timer(timer t); -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Get an awaitable to wait a certain amount of seconds. Use the co_await keyword on its return value to suspend the coroutine until the timer ends * @@ -576,7 +576,7 @@ class DPP_EXPORT cluster { */ size_t active_requests(); -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Register a coroutine-based slash command handler. * @@ -4071,7 +4071,7 @@ class DPP_EXPORT cluster { */ void channel_set_voice_status(snowflake channel_id, const std::string& status, command_completion_event_t callback = utility::log_error()); -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include #endif diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/async.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/async.h index 2feac38d..6f422597 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/async.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/async.h @@ -32,7 +32,7 @@ struct async_dummy : awaitable_dummy { } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include "coro.h" @@ -186,4 +186,4 @@ DPP_CHECK_ABI_COMPAT(async<>, async_dummy); } -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/awaitable.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/awaitable.h index f27a39f4..4bc8cddf 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/awaitable.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/awaitable.h @@ -33,7 +33,7 @@ struct awaitable_dummy { } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include @@ -732,4 +732,4 @@ void spawn_sync_wait_job(auto* awaitable, std::condition_variable &cv, auto&& re } -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/coro.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/coro.h index 34827deb..1592a02b 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/coro.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/coro.h @@ -20,7 +20,7 @@ ************************************************************************************/ #pragma once -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #if (defined(_LIBCPP_VERSION) and !defined(__cpp_impl_coroutine)) // if libc++ experimental implementation (LLVM < 14) # define STDCORO_EXPERIMENTAL_HEADER @@ -198,5 +198,5 @@ inline int coro_alloc_count = 0; } // namespace dpp -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/coroutine.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/coroutine.h index 648ac2b7..a2f541c2 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/coroutine.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/coroutine.h @@ -30,7 +30,7 @@ struct coroutine_dummy { } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include #include @@ -403,4 +403,4 @@ struct dpp::detail::std_coroutine::coroutine_traits, Args...> using promise_type = dpp::detail::coroutine::promise_t; }; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/job.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/job.h index ed6ab251..4b3ef506 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/job.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/job.h @@ -29,7 +29,7 @@ struct job_dummy { } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include "coro.h" @@ -142,4 +142,4 @@ struct dpp::detail::std_coroutine::coroutine_traits { using promise_type = dpp::detail::job::promise; }; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/task.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/task.h index d57bc8ce..04772318 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/task.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/task.h @@ -31,7 +31,7 @@ struct task_dummy : awaitable_dummy { } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include @@ -443,4 +443,4 @@ struct dpp::detail::std_coroutine::coroutine_traits, Args...> { using promise_type = dpp::detail::task::promise_t; }; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/coro/when_any.h b/MyBot/dependencies/include/dpp-10.1/dpp/coro/when_any.h index 1e3fd5a3..7c3c3110 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/coro/when_any.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/coro/when_any.h @@ -19,7 +19,7 @@ * ************************************************************************************/ -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #pragma once #include "coro.h" diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/dispatcher.h b/MyBot/dependencies/include/dpp-10.1/dpp/dispatcher.h index 6ea8989b..915b9d1c 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/dispatcher.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/dispatcher.h @@ -50,9 +50,9 @@ #include #include -#ifdef DPP_CORO +#ifndef DPP_NO_CORO #include -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ namespace dpp { @@ -582,7 +582,7 @@ struct DPP_EXPORT interaction_create_t : public event_dispatch_t { */ void delete_original_response(command_completion_event_t callback = utility::log_error()) const; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Acknowledge interaction without displaying a message to the user, * for use with button and select menu components. @@ -680,7 +680,7 @@ struct DPP_EXPORT interaction_create_t : public event_dispatch_t { * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error(). */ dpp::async co_delete_original_response() const; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ /** * @brief command interaction @@ -1696,7 +1696,7 @@ struct DPP_EXPORT message_create_t : public event_dispatch_t { */ void reply(message&& msg, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Send a text to the same channel as the channel_id in received event. * @@ -1747,7 +1747,7 @@ struct DPP_EXPORT message_create_t : public event_dispatch_t { * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error(). */ dpp::async co_reply(message&& msg, bool mention_replied_user = false) const; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ }; /** diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/event_router.h b/MyBot/dependencies/include/dpp-10.1/dpp/event_router.h index 7a352f04..656badfb 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/event_router.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/event_router.h @@ -39,7 +39,7 @@ namespace dpp { -#ifdef DPP_CORO +#ifndef DPP_NO_CORO template class event_router_t; @@ -212,7 +212,7 @@ template class event_router_t { */ using event_handler_abi_t = std::variant>; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO friend class detail::event_router::awaitable; /** @brief dpp::task coro event handler */ @@ -247,7 +247,7 @@ template class event_router_t { */ std::map dispatch_container; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Mutex for messing with coro_awaiters. */ @@ -311,7 +311,7 @@ template class event_router_t { }; } -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Handle an event as a coroutine, ensuring the lifetime of the event object. */ @@ -425,7 +425,7 @@ template class event_router_t { * This will be caught in this destructor, however, make sure no other exceptions are thrown in the coroutine after that or it will terminate. */ ~event_router_t() { -#ifdef DPP_CORO +#ifndef DPP_NO_CORO while (!coro_awaiters.empty()) { // cancel all awaiters. here we cannot do the usual loop as we'd need to lock coro_mutex, and cancel() locks and modifies coro_awaiters try { @@ -449,7 +449,7 @@ template class event_router_t { * @param event Class to pass as parameter to all listeners. */ void call(const T& event) const { -#ifdef DPP_CORO +#ifndef DPP_NO_CORO handle_coro(event); #else handle(event); @@ -463,14 +463,14 @@ template class event_router_t { * @param event Class to pass as parameter to all listeners. */ void call(T&& event) const { -#ifdef DPP_CORO +#ifndef DPP_NO_CORO handle_coro(std::move(event)); #else handle(std::move(event)); #endif }; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Obtain an awaitable object that refers to an event with a certain condition. * It can be co_await-ed to wait for the next event that satisfies this condition. @@ -542,7 +542,7 @@ template class event_router_t { * @retval false if there are some listeners */ [[nodiscard]] bool empty() const { -#ifdef DPP_CORO +#ifndef DPP_NO_CORO std::shared_lock lock{mutex}; std::shared_lock coro_lock{coro_mutex}; @@ -569,7 +569,7 @@ template class event_router_t { /** * @brief Attach a callable to the event, adding a listener. * The callable should either be of the form `void(const T&)` or - * `dpp::task(const T&)` (the latter requires DPP_CORO to be defined), + * `dpp::task(const T&)`, * where T is the event type for this event router. * * This has the exact same behavior as using \ref attach(F&&) "attach". @@ -585,7 +585,7 @@ template class event_router_t { /** * @brief Attach a callable to the event, adding a listener. * The callable should either be of the form `void(const T&)` or - * `dpp::task(const T&)` (the latter requires DPP_CORO to be defined), + * `dpp::task(const T&)`, * where T is the event type for this event router. * * @param fun Callable to attach to event @@ -595,7 +595,7 @@ template class event_router_t { template [[maybe_unused]] event_handle attach(F&& fun); #else /* not _DOXYGEN_ */ -# ifdef DPP_CORO +# ifndef DPP_NO_CORO /** * @brief Attach a callable to the event, adding a listener. * The callable should either be of the form `void(const T&)` or @@ -681,7 +681,7 @@ template class event_router_t { dispatch_container.emplace(h, std::forward(fun)); return h; } -# endif /* DPP_CORO */ +# endif /* DPP_NO_CORO */ #endif /* _DOXYGEN_ */ /** * @brief Detach a listener from the event using a previously obtained ID. @@ -698,7 +698,7 @@ template class event_router_t { } }; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO namespace detail::event_router { diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/exception.h b/MyBot/dependencies/include/dpp-10.1/dpp/exception.h index 9d6dd2d6..c0d81a31 100644 --- a/MyBot/dependencies/include/dpp-10.1/dpp/exception.h +++ b/MyBot/dependencies/include/dpp-10.1/dpp/exception.h @@ -579,13 +579,13 @@ class exception : public std::exception * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception. */ class invalid_token_exception : public dpp::rest_exception { }; -#ifdef DPP_CORO +#ifndef DPP_NO_CORO /** * @brief Represents the cancellation of a task. Will be thrown to the awaiter of a cancelled task. * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception. */ class task_cancelled_exception : public dpp::exception { }; -#endif /* DPP_CORO */ +#endif /* DPP_NO_CORO */ #else derived_exception(logic_exception, exception); derived_exception(file_exception, exception); @@ -598,9 +598,9 @@ class exception : public std::exception derived_exception(length_exception, exception); derived_exception(parse_exception, exception); derived_exception(cache_exception, exception); -# ifdef DPP_CORO +# ifndef DPP_NO_CORO derived_exception(task_cancelled_exception, exception); -# endif /* DPP_CORO */ +# endif /* DPP_NO_CORO */ #endif }