From 7ec29055de1c76d16dd6b1c97f1bc03a36dd9a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=83=E6=B4=97?= <758251611@qq.com> Date: Mon, 15 Apr 2024 20:21:24 +0800 Subject: [PATCH] fixed conflict with windows.h --- include/fast_io_dsal/impl/common.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/fast_io_dsal/impl/common.h b/include/fast_io_dsal/impl/common.h index fe83f3ea1..2a14c5569 100644 --- a/include/fast_io_dsal/impl/common.h +++ b/include/fast_io_dsal/impl/common.h @@ -38,24 +38,24 @@ struct handle_holder : value{} {} constexpr handle_holder(decltype(nullptr)) noexcept = delete; - constexpr handle_holder(handle small) noexcept + constexpr handle_holder(handle small_object) noexcept requires(is_trivally_stored_allocator_handle) - : value(small) + : value(small_object) {} - constexpr handle_holder(handle *small) noexcept + constexpr handle_holder(handle *small_object) noexcept requires is_trivally_stored_allocator_handle - : value(*small) + : value(*small_object) {} template - constexpr handle_holder(A &&large) noexcept + constexpr handle_holder(A &&large_object) noexcept requires(::std::same_as<::std::remove_cvref_t, handle> && !is_trivally_stored_allocator_handle) { - value = ::fast_io::typed_generic_allocator_adapter::handle_allocate(large, 1); - ::std::construct_at(value, ::std::forward(large)); + value = ::fast_io::typed_generic_allocator_adapter::handle_allocate(large_object, 1); + ::std::construct_at(value, ::std::forward(large_object)); } - constexpr handle_holder(handle *large) noexcept + constexpr handle_holder(handle *large_object) noexcept requires(!is_trivally_stored_allocator_handle) - : value(large) + : value(large_object) {} constexpr handle_holder(handle_holder const &) noexcept = default; constexpr handle_holder &operator=(handle_holder const &) noexcept = default;