From 01ae20ee13c251e7c666491fe01f267c3f90081c Mon Sep 17 00:00:00 2001 From: Weidong Lian Date: Wed, 31 Jul 2024 02:14:30 +0200 Subject: [PATCH] add new asio --- third_party/asio/asio.hpp | 23 - third_party/asio/asio/any_io_executor.hpp | 70 - third_party/asio/asio/append.hpp | 39 - third_party/asio/asio/as_tuple.hpp | 76 -- .../asio/asio/associated_allocator.hpp | 57 - .../asio/associated_cancellation_slot.hpp | 79 -- third_party/asio/asio/associated_executor.hpp | 56 - third_party/asio/asio/associator.hpp | 8 - third_party/asio/asio/async_result.hpp | 1183 ---------------- third_party/asio/asio/awaitable.hpp | 4 - .../asio/asio/basic_datagram_socket.hpp | 214 --- .../asio/asio/basic_deadline_timer.hpp | 38 - third_party/asio/asio/basic_file.hpp | 76 -- third_party/asio/asio/basic_io_object.hpp | 4 - .../asio/asio/basic_random_access_file.hpp | 118 -- third_party/asio/asio/basic_raw_socket.hpp | 212 --- third_party/asio/asio/basic_readable_pipe.hpp | 84 -- .../asio/asio/basic_seq_packet_socket.hpp | 108 -- third_party/asio/asio/basic_serial_port.hpp | 89 -- third_party/asio/asio/basic_signal_set.hpp | 48 - third_party/asio/asio/basic_socket.hpp | 83 -- .../asio/asio/basic_socket_acceptor.hpp | 350 ----- .../asio/asio/basic_socket_iostream.hpp | 4 - .../asio/asio/basic_socket_streambuf.hpp | 4 - third_party/asio/asio/basic_stream_file.hpp | 115 -- third_party/asio/asio/basic_stream_socket.hpp | 172 --- third_party/asio/asio/basic_streambuf.hpp | 4 - third_party/asio/asio/basic_streambuf_fwd.hpp | 4 - .../asio/asio/basic_waitable_timer.hpp | 48 - third_party/asio/asio/basic_writable_pipe.hpp | 84 -- third_party/asio/asio/bind_allocator.hpp | 439 ------ .../asio/asio/bind_cancellation_slot.hpp | 423 ------ third_party/asio/asio/bind_executor.hpp | 237 ---- third_party/asio/asio/buffer.hpp | 379 ----- third_party/asio/asio/buffer_registration.hpp | 128 -- .../asio/asio/buffered_read_stream.hpp | 48 - .../asio/asio/buffered_read_stream_fwd.hpp | 4 - third_party/asio/asio/buffered_stream.hpp | 57 - third_party/asio/asio/buffered_stream_fwd.hpp | 4 - .../asio/asio/buffered_write_stream.hpp | 48 - .../asio/asio/buffered_write_stream_fwd.hpp | 4 - third_party/asio/asio/buffers_iterator.hpp | 4 - third_party/asio/asio/cancellation_signal.hpp | 154 --- third_party/asio/asio/cancellation_state.hpp | 49 - third_party/asio/asio/cancellation_type.hpp | 49 - third_party/asio/asio/co_spawn.hpp | 46 - .../asio/asio/completion_condition.hpp | 4 - third_party/asio/asio/compose.hpp | 712 ---------- third_party/asio/asio/connect.hpp | 186 --- third_party/asio/asio/connect_pipe.hpp | 4 - third_party/asio/asio/coroutine.hpp | 4 - third_party/asio/asio/deadline_timer.hpp | 4 - third_party/asio/asio/defer.hpp | 74 - third_party/asio/asio/deferred.hpp | 512 ------- third_party/asio/asio/detached.hpp | 10 - third_party/asio/asio/detail/array.hpp | 4 - third_party/asio/asio/detail/array_fwd.hpp | 4 - third_party/asio/asio/detail/assert.hpp | 4 - third_party/asio/asio/detail/atomic_count.hpp | 14 - .../detail/base_from_cancellation_state.hpp | 59 - .../asio/detail/base_from_completion_cond.hpp | 4 - third_party/asio/asio/detail/bind_handler.hpp | 206 --- .../asio/asio/detail/blocking_executor_op.hpp | 4 - .../asio/asio/detail/buffer_resize_guard.hpp | 4 - .../asio/detail/buffer_sequence_adapter.hpp | 4 - .../asio/detail/buffered_stream_storage.hpp | 4 - .../asio/asio/detail/bulk_executor_op.hpp | 88 -- third_party/asio/asio/detail/call_stack.hpp | 4 - third_party/asio/asio/detail/chrono.hpp | 4 - .../asio/asio/detail/chrono_time_traits.hpp | 4 - .../asio/asio/detail/completion_handler.hpp | 4 - .../asio/asio/detail/concurrency_hint.hpp | 4 - .../detail/conditionally_enabled_event.hpp | 4 - .../detail/conditionally_enabled_mutex.hpp | 4 - third_party/asio/asio/detail/config.hpp | 942 ------------- .../asio/asio/detail/consuming_buffers.hpp | 4 - third_party/asio/asio/detail/cstddef.hpp | 4 - third_party/asio/asio/detail/cstdint.hpp | 23 - .../asio/asio/detail/date_time_fwd.hpp | 4 - .../asio/detail/deadline_timer_service.hpp | 8 - .../asio/asio/detail/dependent_type.hpp | 4 - .../asio/asio/detail/descriptor_ops.hpp | 4 - .../asio/asio/detail/descriptor_read_op.hpp | 4 - .../asio/asio/detail/descriptor_write_op.hpp | 4 - .../asio/asio/detail/dev_poll_reactor.hpp | 8 - .../asio/asio/detail/epoll_reactor.hpp | 8 - third_party/asio/asio/detail/event.hpp | 4 - .../detail/eventfd_select_interrupter.hpp | 4 - third_party/asio/asio/detail/exception.hpp | 25 - .../asio/asio/detail/executor_function.hpp | 4 - third_party/asio/asio/detail/executor_op.hpp | 4 - .../asio/asio/detail/fd_set_adapter.hpp | 4 - third_party/asio/asio/detail/fenced_block.hpp | 4 - third_party/asio/asio/detail/functional.hpp | 11 - third_party/asio/asio/detail/future.hpp | 4 - .../asio/asio/detail/gcc_arm_fenced_block.hpp | 91 -- .../asio/detail/gcc_hppa_fenced_block.hpp | 68 - .../asio/detail/gcc_sync_fenced_block.hpp | 65 - .../asio/asio/detail/gcc_x86_fenced_block.hpp | 99 -- third_party/asio/asio/detail/global.hpp | 4 - .../asio/detail/handler_alloc_helpers.hpp | 175 --- .../asio/asio/detail/handler_cont_helpers.hpp | 4 - .../asio/detail/handler_invoke_helpers.hpp | 80 -- .../asio/asio/detail/handler_tracking.hpp | 4 - .../asio/detail/handler_type_requirements.hpp | 32 - third_party/asio/asio/detail/handler_work.hpp | 122 -- third_party/asio/asio/detail/hash_map.hpp | 4 - .../detail/impl/buffer_sequence_adapter.ipp | 4 - .../asio/asio/detail/impl/descriptor_ops.ipp | 4 - .../asio/detail/impl/dev_poll_reactor.hpp | 8 - .../asio/detail/impl/dev_poll_reactor.ipp | 4 - .../asio/asio/detail/impl/epoll_reactor.hpp | 8 - .../asio/asio/detail/impl/epoll_reactor.ipp | 4 - .../impl/eventfd_select_interrupter.ipp | 4 - .../asio/detail/impl/handler_tracking.ipp | 4 - .../impl/io_uring_descriptor_service.ipp | 8 - .../detail/impl/io_uring_file_service.ipp | 4 - .../asio/detail/impl/io_uring_service.hpp | 4 - .../asio/detail/impl/io_uring_service.ipp | 81 -- .../impl/io_uring_socket_service_base.ipp | 8 - .../asio/asio/detail/impl/kqueue_reactor.hpp | 8 - .../asio/asio/detail/impl/kqueue_reactor.ipp | 4 - .../asio/asio/detail/impl/null_event.ipp | 4 - .../detail/impl/pipe_select_interrupter.ipp | 4 - .../asio/asio/detail/impl/posix_event.ipp | 4 - .../asio/asio/detail/impl/posix_mutex.ipp | 4 - .../detail/impl/posix_serial_port_service.ipp | 4 - .../asio/asio/detail/impl/posix_thread.ipp | 4 - .../asio/asio/detail/impl/posix_tss_ptr.ipp | 4 - .../impl/reactive_descriptor_service.ipp | 4 - .../impl/reactive_socket_service_base.ipp | 8 - .../detail/impl/resolver_service_base.ipp | 4 - .../asio/asio/detail/impl/scheduler.ipp | 4 - .../asio/asio/detail/impl/select_reactor.hpp | 8 - .../asio/asio/detail/impl/select_reactor.ipp | 4 - .../asio/detail/impl/service_registry.hpp | 4 - .../asio/detail/impl/service_registry.ipp | 4 - .../asio/detail/impl/signal_set_service.ipp | 4 - .../asio/asio/detail/impl/socket_ops.ipp | 4 - .../detail/impl/socket_select_interrupter.ipp | 4 - .../detail/impl/strand_executor_service.hpp | 14 - .../detail/impl/strand_executor_service.ipp | 4 - .../asio/asio/detail/impl/strand_service.hpp | 4 - .../asio/asio/detail/impl/strand_service.ipp | 4 - .../asio/asio/detail/impl/thread_context.ipp | 4 - .../asio/asio/detail/impl/throw_error.ipp | 30 - .../asio/detail/impl/timer_queue_ptime.ipp | 12 - .../asio/asio/detail/impl/timer_queue_set.ipp | 4 - .../asio/asio/detail/impl/win_event.ipp | 4 - .../detail/impl/win_iocp_file_service.ipp | 20 - .../detail/impl/win_iocp_handle_service.ipp | 4 - .../asio/detail/impl/win_iocp_io_context.hpp | 4 - .../asio/detail/impl/win_iocp_io_context.ipp | 4 - .../impl/win_iocp_serial_port_service.ipp | 4 - .../impl/win_iocp_socket_service_base.ipp | 4 - .../asio/asio/detail/impl/win_mutex.ipp | 4 - .../detail/impl/win_object_handle_service.ipp | 4 - .../asio/detail/impl/win_static_mutex.ipp | 4 - .../asio/asio/detail/impl/win_thread.ipp | 4 - .../asio/asio/detail/impl/win_tss_ptr.ipp | 4 - .../impl/winrt_ssocket_service_base.ipp | 4 - .../detail/impl/winrt_timer_scheduler.hpp | 4 - .../detail/impl/winrt_timer_scheduler.ipp | 4 - .../asio/asio/detail/impl/winsock_init.ipp | 4 - third_party/asio/asio/detail/io_control.hpp | 4 - .../asio/asio/detail/io_object_impl.hpp | 4 - .../detail/io_uring_descriptor_read_at_op.hpp | 21 - .../detail/io_uring_descriptor_read_op.hpp | 21 - .../detail/io_uring_descriptor_service.hpp | 39 - .../io_uring_descriptor_write_at_op.hpp | 21 - .../detail/io_uring_descriptor_write_op.hpp | 21 - .../asio/detail/io_uring_file_service.hpp | 9 - .../asio/detail/io_uring_null_buffers_op.hpp | 22 - .../asio/asio/detail/io_uring_operation.hpp | 4 - .../asio/asio/detail/io_uring_service.hpp | 9 - .../asio/detail/io_uring_socket_accept_op.hpp | 51 - .../detail/io_uring_socket_connect_op.hpp | 22 - .../asio/detail/io_uring_socket_recv_op.hpp | 21 - .../detail/io_uring_socket_recvfrom_op.hpp | 23 - .../detail/io_uring_socket_recvmsg_op.hpp | 21 - .../asio/detail/io_uring_socket_send_op.hpp | 21 - .../asio/detail/io_uring_socket_sendto_op.hpp | 21 - .../asio/detail/io_uring_socket_service.hpp | 52 - .../detail/io_uring_socket_service_base.hpp | 36 - .../asio/asio/detail/io_uring_wait_op.hpp | 22 - .../asio/asio/detail/is_buffer_sequence.hpp | 4 - third_party/asio/asio/detail/is_executor.hpp | 4 - .../asio/asio/detail/keyword_tss_ptr.hpp | 4 - .../asio/asio/detail/kqueue_reactor.hpp | 8 - .../asio/detail/local_free_on_block_exit.hpp | 4 - .../asio/asio/detail/macos_fenced_block.hpp | 62 - third_party/asio/asio/detail/memory.hpp | 79 -- third_party/asio/asio/detail/mutex.hpp | 4 - .../asio/asio/detail/non_const_lvalue.hpp | 4 - third_party/asio/asio/detail/noncopyable.hpp | 4 - third_party/asio/asio/detail/null_event.hpp | 4 - .../asio/asio/detail/null_fenced_block.hpp | 4 - third_party/asio/asio/detail/null_global.hpp | 4 - third_party/asio/asio/detail/null_mutex.hpp | 4 - third_party/asio/asio/detail/null_reactor.hpp | 4 - .../asio/asio/detail/null_signal_blocker.hpp | 4 - .../asio/asio/detail/null_socket_service.hpp | 4 - .../asio/asio/detail/null_static_mutex.hpp | 4 - third_party/asio/asio/detail/null_thread.hpp | 4 - third_party/asio/asio/detail/null_tss_ptr.hpp | 4 - third_party/asio/asio/detail/object_pool.hpp | 4 - .../asio/asio/detail/old_win_sdk_compat.hpp | 4 - third_party/asio/asio/detail/op_queue.hpp | 4 - third_party/asio/asio/detail/operation.hpp | 4 - .../asio/detail/pipe_select_interrupter.hpp | 4 - third_party/asio/asio/detail/pop_options.hpp | 4 - third_party/asio/asio/detail/posix_event.hpp | 4 - .../asio/asio/detail/posix_fd_set_adapter.hpp | 4 - third_party/asio/asio/detail/posix_global.hpp | 4 - third_party/asio/asio/detail/posix_mutex.hpp | 4 - .../asio/detail/posix_serial_port_service.hpp | 4 - .../asio/asio/detail/posix_signal_blocker.hpp | 4 - .../asio/asio/detail/posix_static_mutex.hpp | 4 - third_party/asio/asio/detail/posix_thread.hpp | 4 - .../asio/asio/detail/posix_tss_ptr.hpp | 4 - third_party/asio/asio/detail/push_options.hpp | 4 - .../detail/reactive_descriptor_service.hpp | 63 - .../asio/detail/reactive_null_buffers_op.hpp | 4 - .../asio/detail/reactive_socket_accept_op.hpp | 4 - .../detail/reactive_socket_connect_op.hpp | 4 - .../asio/detail/reactive_socket_recv_op.hpp | 4 - .../detail/reactive_socket_recvfrom_op.hpp | 4 - .../detail/reactive_socket_recvmsg_op.hpp | 4 - .../asio/detail/reactive_socket_send_op.hpp | 4 - .../asio/detail/reactive_socket_sendto_op.hpp | 4 - .../asio/detail/reactive_socket_service.hpp | 32 - .../detail/reactive_socket_service_base.hpp | 49 - .../asio/asio/detail/reactive_wait_op.hpp | 4 - third_party/asio/asio/detail/reactor.hpp | 4 - third_party/asio/asio/detail/reactor_op.hpp | 4 - .../asio/asio/detail/reactor_op_queue.hpp | 4 - .../asio/asio/detail/recycling_allocator.hpp | 15 - third_party/asio/asio/detail/regex_fwd.hpp | 19 - .../asio/asio/detail/resolve_endpoint_op.hpp | 4 - third_party/asio/asio/detail/resolve_op.hpp | 4 - .../asio/asio/detail/resolve_query_op.hpp | 4 - .../asio/asio/detail/resolver_service.hpp | 4 - .../asio/detail/resolver_service_base.hpp | 4 - third_party/asio/asio/detail/scheduler.hpp | 4 - .../asio/asio/detail/scheduler_operation.hpp | 4 - .../asio/asio/detail/scheduler_task.hpp | 4 - .../asio/detail/scheduler_thread_info.hpp | 4 - third_party/asio/asio/detail/scoped_lock.hpp | 4 - third_party/asio/asio/detail/scoped_ptr.hpp | 4 - .../asio/asio/detail/select_interrupter.hpp | 4 - .../asio/asio/detail/select_reactor.hpp | 8 - .../asio/asio/detail/service_registry.hpp | 4 - .../asio/asio/detail/signal_blocker.hpp | 4 - .../asio/asio/detail/signal_handler.hpp | 4 - third_party/asio/asio/detail/signal_init.hpp | 4 - third_party/asio/asio/detail/signal_op.hpp | 4 - .../asio/asio/detail/signal_set_service.hpp | 8 - .../asio/asio/detail/socket_holder.hpp | 4 - third_party/asio/asio/detail/socket_ops.hpp | 4 - .../asio/asio/detail/socket_option.hpp | 4 - .../asio/detail/socket_select_interrupter.hpp | 4 - third_party/asio/asio/detail/socket_types.hpp | 4 - .../asio/asio/detail/solaris_fenced_block.hpp | 62 - .../asio/asio/detail/source_location.hpp | 4 - third_party/asio/asio/detail/static_mutex.hpp | 4 - third_party/asio/asio/detail/std_event.hpp | 4 - .../asio/asio/detail/std_fenced_block.hpp | 4 - third_party/asio/asio/detail/std_global.hpp | 4 - third_party/asio/asio/detail/std_mutex.hpp | 4 - .../asio/asio/detail/std_static_mutex.hpp | 4 - third_party/asio/asio/detail/std_thread.hpp | 4 - .../asio/detail/strand_executor_service.hpp | 4 - .../asio/asio/detail/strand_service.hpp | 4 - third_party/asio/asio/detail/string_view.hpp | 4 - third_party/asio/asio/detail/thread.hpp | 4 - .../asio/asio/detail/thread_context.hpp | 4 - third_party/asio/asio/detail/thread_group.hpp | 4 - .../asio/asio/detail/thread_info_base.hpp | 8 - third_party/asio/asio/detail/throw_error.hpp | 4 - .../asio/asio/detail/throw_exception.hpp | 4 - third_party/asio/asio/detail/timer_queue.hpp | 4 - .../asio/asio/detail/timer_queue_base.hpp | 4 - .../asio/asio/detail/timer_queue_ptime.hpp | 4 - .../asio/asio/detail/timer_queue_set.hpp | 4 - .../asio/asio/detail/timer_scheduler.hpp | 4 - .../asio/asio/detail/timer_scheduler_fwd.hpp | 4 - third_party/asio/asio/detail/tss_ptr.hpp | 4 - third_party/asio/asio/detail/type_traits.hpp | 127 -- third_party/asio/asio/detail/utility.hpp | 21 - .../asio/asio/detail/variadic_templates.hpp | 294 ---- third_party/asio/asio/detail/wait_handler.hpp | 4 - third_party/asio/asio/detail/wait_op.hpp | 4 - third_party/asio/asio/detail/win_event.hpp | 4 - .../asio/asio/detail/win_fd_set_adapter.hpp | 4 - .../asio/asio/detail/win_fenced_block.hpp | 90 -- third_party/asio/asio/detail/win_global.hpp | 4 - .../asio/detail/win_iocp_file_service.hpp | 4 - .../asio/detail/win_iocp_handle_read_op.hpp | 4 - .../asio/detail/win_iocp_handle_service.hpp | 20 - .../asio/detail/win_iocp_handle_write_op.hpp | 4 - .../asio/asio/detail/win_iocp_io_context.hpp | 4 - .../asio/detail/win_iocp_null_buffers_op.hpp | 4 - .../asio/asio/detail/win_iocp_operation.hpp | 4 - .../asio/detail/win_iocp_overlapped_op.hpp | 4 - .../asio/detail/win_iocp_overlapped_ptr.hpp | 4 - .../detail/win_iocp_serial_port_service.hpp | 4 - .../asio/detail/win_iocp_socket_accept_op.hpp | 12 - .../detail/win_iocp_socket_connect_op.hpp | 4 - .../asio/detail/win_iocp_socket_recv_op.hpp | 4 - .../detail/win_iocp_socket_recvfrom_op.hpp | 4 - .../detail/win_iocp_socket_recvmsg_op.hpp | 4 - .../asio/detail/win_iocp_socket_send_op.hpp | 4 - .../asio/detail/win_iocp_socket_service.hpp | 28 - .../detail/win_iocp_socket_service_base.hpp | 28 - .../asio/asio/detail/win_iocp_thread_info.hpp | 4 - .../asio/asio/detail/win_iocp_wait_op.hpp | 4 - third_party/asio/asio/detail/win_mutex.hpp | 4 - .../asio/detail/win_object_handle_service.hpp | 4 - .../asio/asio/detail/win_static_mutex.hpp | 4 - third_party/asio/asio/detail/win_thread.hpp | 4 - third_party/asio/asio/detail/win_tss_ptr.hpp | 4 - .../asio/asio/detail/winapp_thread.hpp | 4 - third_party/asio/asio/detail/wince_thread.hpp | 4 - .../asio/asio/detail/winrt_async_manager.hpp | 4 - .../asio/asio/detail/winrt_async_op.hpp | 4 - .../asio/asio/detail/winrt_resolve_op.hpp | 4 - .../asio/detail/winrt_resolver_service.hpp | 4 - .../asio/detail/winrt_socket_connect_op.hpp | 4 - .../asio/asio/detail/winrt_socket_recv_op.hpp | 4 - .../asio/asio/detail/winrt_socket_send_op.hpp | 4 - .../asio/detail/winrt_ssocket_service.hpp | 4 - .../detail/winrt_ssocket_service_base.hpp | 4 - .../asio/detail/winrt_timer_scheduler.hpp | 4 - third_party/asio/asio/detail/winrt_utils.hpp | 4 - third_party/asio/asio/detail/winsock_init.hpp | 4 - .../asio/asio/detail/work_dispatcher.hpp | 19 - .../asio/asio/detail/wrapped_handler.hpp | 4 - third_party/asio/asio/dispatch.hpp | 71 - third_party/asio/asio/error.hpp | 4 - third_party/asio/asio/error_code.hpp | 4 - third_party/asio/asio/execution.hpp | 4 - third_party/asio/asio/execution/allocator.hpp | 119 -- .../asio/asio/execution/any_executor.hpp | 454 ------ .../asio/asio/execution/bad_executor.hpp | 4 - third_party/asio/asio/execution/blocking.hpp | 317 ----- .../asio/execution/blocking_adaptation.hpp | 231 ---- .../asio/asio/execution/bulk_execute.hpp | 397 ------ .../asio/asio/execution/bulk_guarantee.hpp | 1215 ----------------- third_party/asio/asio/execution/connect.hpp | 489 ------- third_party/asio/asio/execution/context.hpp | 64 - .../asio/asio/execution/context_as.hpp | 51 - .../asio/execution/detail/as_invocable.hpp | 152 --- .../asio/execution/detail/as_operation.hpp | 105 -- .../asio/execution/detail/as_receiver.hpp | 128 -- .../asio/execution/detail/bulk_sender.hpp | 261 ---- .../asio/execution/detail/submit_receiver.hpp | 233 ---- .../asio/execution/detail/void_receiver.hpp | 90 -- third_party/asio/asio/execution/execute.hpp | 283 ---- third_party/asio/asio/execution/executor.hpp | 40 - .../asio/asio/execution/impl/bad_executor.ipp | 4 - .../impl/receiver_invocation_error.ipp | 36 - .../asio/execution/invocable_archetype.hpp | 4 - third_party/asio/asio/execution/mapping.hpp | 312 ----- third_party/asio/asio/execution/occupancy.hpp | 64 - .../asio/asio/execution/operation_state.hpp | 94 -- .../asio/asio/execution/outstanding_work.hpp | 231 ---- .../asio/asio/execution/prefer_only.hpp | 18 - third_party/asio/asio/execution/receiver.hpp | 280 ---- .../execution/receiver_invocation_error.hpp | 48 - .../asio/asio/execution/relationship.hpp | 231 ---- third_party/asio/asio/execution/schedule.hpp | 287 ---- third_party/asio/asio/execution/scheduler.hpp | 86 -- third_party/asio/asio/execution/sender.hpp | 311 ----- third_party/asio/asio/execution/set_done.hpp | 250 ---- third_party/asio/asio/execution/set_error.hpp | 250 ---- third_party/asio/asio/execution/set_value.hpp | 483 ------- third_party/asio/asio/execution/start.hpp | 247 ---- third_party/asio/asio/execution/submit.hpp | 450 ------ third_party/asio/asio/execution_context.hpp | 4 - third_party/asio/asio/executor.hpp | 4 - third_party/asio/asio/executor_work_guard.hpp | 122 -- third_party/asio/asio/experimental/append.hpp | 4 - .../asio/asio/experimental/as_single.hpp | 15 - .../asio/asio/experimental/as_tuple.hpp | 4 - .../asio/experimental/awaitable_operators.hpp | 22 - .../asio/asio/experimental/basic_channel.hpp | 122 -- .../experimental/basic_concurrent_channel.hpp | 123 -- .../experimental/cancellation_condition.hpp | 68 - .../asio/asio/experimental/channel.hpp | 11 - .../asio/asio/experimental/channel_error.hpp | 12 - .../asio/asio/experimental/channel_traits.hpp | 43 - .../asio/asio/experimental/co_spawn.hpp | 4 - .../asio/experimental/concurrent_channel.hpp | 11 - third_party/asio/asio/experimental/coro.hpp | 34 - .../asio/asio/experimental/coro_traits.hpp | 4 - .../asio/asio/experimental/deferred.hpp | 4 - .../experimental/detail/channel_handler.hpp | 70 - .../experimental/detail/channel_message.hpp | 122 -- .../experimental/detail/channel_operation.hpp | 101 -- .../experimental/detail/channel_payload.hpp | 93 -- .../detail/channel_receive_op.hpp | 39 - .../detail/channel_send_functions.hpp | 82 -- .../experimental/detail/channel_send_op.hpp | 40 - .../experimental/detail/channel_service.hpp | 166 --- .../detail/completion_handler_erasure.hpp | 194 --- .../detail/coro_promise_allocator.hpp | 96 -- .../experimental/detail/has_signature.hpp | 4 - .../detail/impl/channel_service.hpp | 136 -- .../experimental/detail/partial_promise.hpp | 87 -- .../asio/asio/experimental/impl/as_single.hpp | 84 -- .../asio/experimental/impl/channel_error.ipp | 8 - .../asio/asio/experimental/impl/coro.hpp | 302 ---- .../asio/experimental/impl/parallel_group.hpp | 79 -- .../asio/asio/experimental/impl/promise.hpp | 71 - .../asio/asio/experimental/impl/use_coro.hpp | 247 ---- .../asio/asio/experimental/parallel_group.hpp | 37 - .../asio/asio/experimental/prepend.hpp | 4 - .../asio/asio/experimental/promise.hpp | 152 --- .../asio/asio/experimental/use_coro.hpp | 91 -- third_party/asio/asio/file_base.hpp | 4 - .../asio/asio/generic/basic_endpoint.hpp | 4 - .../asio/asio/generic/datagram_protocol.hpp | 4 - .../asio/asio/generic/detail/endpoint.hpp | 4 - .../asio/generic/detail/impl/endpoint.ipp | 4 - .../asio/asio/generic/raw_protocol.hpp | 4 - .../asio/asio/generic/seq_packet_protocol.hpp | 4 - .../asio/asio/generic/stream_protocol.hpp | 4 - third_party/asio/asio/handler_alloc_hook.hpp | 104 -- .../asio/asio/handler_continuation_hook.hpp | 4 - third_party/asio/asio/handler_invoke_hook.hpp | 111 -- .../asio/asio/high_resolution_timer.hpp | 4 - .../asio/asio/impl/any_io_executor.ipp | 42 - third_party/asio/asio/impl/append.hpp | 153 --- third_party/asio/asio/impl/as_tuple.hpp | 181 --- third_party/asio/asio/impl/awaitable.hpp | 75 - .../asio/asio/impl/buffered_read_stream.hpp | 57 - .../asio/asio/impl/buffered_write_stream.hpp | 57 - .../asio/asio/impl/cancellation_signal.ipp | 4 - third_party/asio/asio/impl/co_spawn.hpp | 167 --- third_party/asio/asio/impl/connect.hpp | 240 ---- third_party/asio/asio/impl/connect_pipe.hpp | 4 - third_party/asio/asio/impl/connect_pipe.ipp | 4 - third_party/asio/asio/impl/defer.hpp | 266 ---- third_party/asio/asio/impl/deferred.hpp | 53 - third_party/asio/asio/impl/detached.hpp | 4 - third_party/asio/asio/impl/dispatch.hpp | 261 ---- third_party/asio/asio/impl/error.ipp | 4 - third_party/asio/asio/impl/error_code.ipp | 4 - .../asio/asio/impl/execution_context.hpp | 4 - .../asio/asio/impl/execution_context.ipp | 4 - third_party/asio/asio/impl/executor.hpp | 4 - third_party/asio/asio/impl/executor.ipp | 4 - .../asio/asio/impl/handler_alloc_hook.ipp | 62 - third_party/asio/asio/impl/io_context.hpp | 28 - third_party/asio/asio/impl/io_context.ipp | 4 - .../asio/asio/impl/multiple_exceptions.ipp | 4 - third_party/asio/asio/impl/post.hpp | 266 ---- third_party/asio/asio/impl/prepend.hpp | 148 -- third_party/asio/asio/impl/read.hpp | 349 ----- third_party/asio/asio/impl/read_at.hpp | 136 -- third_party/asio/asio/impl/read_until.hpp | 654 --------- third_party/asio/asio/impl/redirect_error.hpp | 354 ----- .../asio/asio/impl/serial_port_base.hpp | 4 - .../asio/asio/impl/serial_port_base.ipp | 4 - third_party/asio/asio/impl/spawn.hpp | 765 ----------- third_party/asio/asio/impl/src.hpp | 11 - third_party/asio/asio/impl/system_context.hpp | 4 - third_party/asio/asio/impl/system_context.ipp | 4 - .../asio/asio/impl/system_executor.hpp | 4 - third_party/asio/asio/impl/thread_pool.hpp | 4 - third_party/asio/asio/impl/thread_pool.ipp | 4 - third_party/asio/asio/impl/use_awaitable.hpp | 4 - third_party/asio/asio/impl/use_future.hpp | 4 - third_party/asio/asio/impl/write.hpp | 359 ----- third_party/asio/asio/impl/write_at.hpp | 132 -- third_party/asio/asio/io_context.hpp | 72 - third_party/asio/asio/io_context_strand.hpp | 20 - third_party/asio/asio/io_service.hpp | 4 - third_party/asio/asio/io_service_strand.hpp | 4 - third_party/asio/asio/ip/address.hpp | 20 - third_party/asio/asio/ip/address_v4.hpp | 48 - .../asio/asio/ip/address_v4_iterator.hpp | 4 - third_party/asio/asio/ip/address_v4_range.hpp | 4 - third_party/asio/asio/ip/address_v6.hpp | 48 - .../asio/asio/ip/address_v6_iterator.hpp | 4 - third_party/asio/asio/ip/address_v6_range.hpp | 4 - third_party/asio/asio/ip/bad_address_cast.hpp | 4 - third_party/asio/asio/ip/basic_endpoint.hpp | 43 - third_party/asio/asio/ip/basic_resolver.hpp | 144 -- .../asio/asio/ip/basic_resolver_entry.hpp | 4 - .../asio/asio/ip/basic_resolver_iterator.hpp | 4 - .../asio/asio/ip/basic_resolver_query.hpp | 4 - .../asio/asio/ip/basic_resolver_results.hpp | 4 - third_party/asio/asio/ip/detail/endpoint.hpp | 4 - .../asio/asio/ip/detail/impl/endpoint.ipp | 4 - .../asio/asio/ip/detail/socket_option.hpp | 4 - third_party/asio/asio/ip/host_name.hpp | 4 - third_party/asio/asio/ip/icmp.hpp | 4 - third_party/asio/asio/ip/impl/address.hpp | 4 - third_party/asio/asio/ip/impl/address.ipp | 4 - third_party/asio/asio/ip/impl/address_v4.hpp | 4 - third_party/asio/asio/ip/impl/address_v4.ipp | 4 - third_party/asio/asio/ip/impl/address_v6.hpp | 4 - third_party/asio/asio/ip/impl/address_v6.ipp | 4 - .../asio/asio/ip/impl/basic_endpoint.hpp | 4 - third_party/asio/asio/ip/impl/host_name.ipp | 4 - third_party/asio/asio/ip/impl/network_v4.hpp | 4 - third_party/asio/asio/ip/impl/network_v4.ipp | 4 - third_party/asio/asio/ip/impl/network_v6.hpp | 4 - third_party/asio/asio/ip/impl/network_v6.ipp | 4 - third_party/asio/asio/ip/multicast.hpp | 4 - third_party/asio/asio/ip/network_v4.hpp | 4 - third_party/asio/asio/ip/network_v6.hpp | 4 - third_party/asio/asio/ip/resolver_base.hpp | 4 - .../asio/asio/ip/resolver_query_base.hpp | 4 - third_party/asio/asio/ip/tcp.hpp | 4 - third_party/asio/asio/ip/udp.hpp | 4 - third_party/asio/asio/ip/unicast.hpp | 4 - third_party/asio/asio/ip/v6_only.hpp | 4 - .../asio/asio/is_applicable_property.hpp | 4 - .../asio/asio/is_contiguous_iterator.hpp | 8 - third_party/asio/asio/is_executor.hpp | 4 - third_party/asio/asio/is_read_buffered.hpp | 4 - third_party/asio/asio/is_write_buffered.hpp | 4 - .../asio/asio/local/basic_endpoint.hpp | 4 - third_party/asio/asio/local/connect_pair.hpp | 4 - .../asio/asio/local/datagram_protocol.hpp | 4 - .../asio/asio/local/detail/endpoint.hpp | 4 - .../asio/asio/local/detail/impl/endpoint.ipp | 4 - .../asio/asio/local/stream_protocol.hpp | 4 - third_party/asio/asio/multiple_exceptions.hpp | 4 - third_party/asio/asio/packaged_task.hpp | 4 - third_party/asio/asio/placeholders.hpp | 4 - .../asio/asio/posix/basic_descriptor.hpp | 61 - .../asio/posix/basic_stream_descriptor.hpp | 77 -- third_party/asio/asio/posix/descriptor.hpp | 4 - .../asio/asio/posix/descriptor_base.hpp | 4 - .../asio/asio/posix/stream_descriptor.hpp | 4 - third_party/asio/asio/post.hpp | 74 - third_party/asio/asio/prefer.hpp | 415 ------ third_party/asio/asio/prepend.hpp | 39 - third_party/asio/asio/query.hpp | 113 -- third_party/asio/asio/random_access_file.hpp | 4 - third_party/asio/asio/read.hpp | 304 ----- third_party/asio/asio/read_at.hpp | 107 -- third_party/asio/asio/read_until.hpp | 491 ------- third_party/asio/asio/readable_pipe.hpp | 4 - third_party/asio/asio/recycling_allocator.hpp | 42 - third_party/asio/asio/redirect_error.hpp | 7 - third_party/asio/asio/registered_buffer.hpp | 162 --- third_party/asio/asio/require.hpp | 294 ---- third_party/asio/asio/require_concept.hpp | 126 -- third_party/asio/asio/serial_port.hpp | 4 - third_party/asio/asio/serial_port_base.hpp | 4 - third_party/asio/asio/signal_set.hpp | 4 - third_party/asio/asio/socket_base.hpp | 4 - third_party/asio/asio/spawn.hpp | 282 ---- third_party/asio/asio/ssl.hpp | 4 - third_party/asio/asio/ssl/context.hpp | 4 - third_party/asio/asio/ssl/context_base.hpp | 4 - .../asio/ssl/detail/buffered_handshake_op.hpp | 8 - third_party/asio/asio/ssl/detail/engine.hpp | 15 - .../asio/asio/ssl/detail/handshake_op.hpp | 8 - .../asio/asio/ssl/detail/impl/engine.ipp | 18 - .../asio/ssl/detail/impl/openssl_init.ipp | 4 - third_party/asio/asio/ssl/detail/io.hpp | 16 - .../asio/asio/ssl/detail/openssl_init.hpp | 4 - .../asio/asio/ssl/detail/openssl_types.hpp | 4 - .../asio/ssl/detail/password_callback.hpp | 4 - third_party/asio/asio/ssl/detail/read_op.hpp | 8 - .../asio/asio/ssl/detail/shutdown_op.hpp | 12 - .../asio/asio/ssl/detail/stream_core.hpp | 41 - .../asio/asio/ssl/detail/verify_callback.hpp | 4 - third_party/asio/asio/ssl/detail/write_op.hpp | 8 - third_party/asio/asio/ssl/error.hpp | 4 - .../asio/asio/ssl/host_name_verification.hpp | 4 - third_party/asio/asio/ssl/impl/context.hpp | 4 - third_party/asio/asio/ssl/impl/context.ipp | 4 - third_party/asio/asio/ssl/impl/error.ipp | 4 - .../asio/ssl/impl/host_name_verification.ipp | 4 - .../asio/ssl/impl/rfc2818_verification.ipp | 4 - third_party/asio/asio/ssl/impl/src.hpp | 4 - .../asio/asio/ssl/rfc2818_verification.hpp | 4 - third_party/asio/asio/ssl/stream.hpp | 136 -- third_party/asio/asio/ssl/stream_base.hpp | 4 - third_party/asio/asio/ssl/verify_context.hpp | 4 - third_party/asio/asio/ssl/verify_mode.hpp | 4 - third_party/asio/asio/static_thread_pool.hpp | 4 - third_party/asio/asio/steady_timer.hpp | 4 - third_party/asio/asio/strand.hpp | 104 -- third_party/asio/asio/stream_file.hpp | 4 - third_party/asio/asio/streambuf.hpp | 4 - third_party/asio/asio/system_context.hpp | 4 - third_party/asio/asio/system_error.hpp | 4 - third_party/asio/asio/system_executor.hpp | 9 - third_party/asio/asio/system_timer.hpp | 4 - third_party/asio/asio/this_coro.hpp | 238 ---- third_party/asio/asio/thread.hpp | 4 - third_party/asio/asio/thread_pool.hpp | 78 -- third_party/asio/asio/time_traits.hpp | 4 - .../asio/asio/traits/bulk_execute_free.hpp | 114 -- .../asio/asio/traits/bulk_execute_member.hpp | 114 -- third_party/asio/asio/traits/connect_free.hpp | 112 -- .../asio/asio/traits/connect_member.hpp | 112 -- .../asio/asio/traits/equality_comparable.hpp | 4 - third_party/asio/asio/traits/execute_free.hpp | 108 -- .../asio/asio/traits/execute_member.hpp | 4 - third_party/asio/asio/traits/prefer_free.hpp | 4 - .../asio/asio/traits/prefer_member.hpp | 4 - third_party/asio/asio/traits/query_free.hpp | 4 - third_party/asio/asio/traits/query_member.hpp | 4 - .../traits/query_static_constexpr_member.hpp | 4 - .../asio/asio/traits/require_concept_free.hpp | 4 - .../asio/traits/require_concept_member.hpp | 4 - third_party/asio/asio/traits/require_free.hpp | 4 - .../asio/asio/traits/require_member.hpp | 4 - .../asio/asio/traits/schedule_free.hpp | 108 -- .../asio/asio/traits/schedule_member.hpp | 108 -- .../asio/asio/traits/set_done_free.hpp | 108 -- .../asio/asio/traits/set_done_member.hpp | 108 -- .../asio/asio/traits/set_error_free.hpp | 112 -- .../asio/asio/traits/set_error_member.hpp | 112 -- .../asio/asio/traits/set_value_free.hpp | 234 ---- .../asio/asio/traits/set_value_member.hpp | 234 ---- third_party/asio/asio/traits/start_free.hpp | 108 -- third_party/asio/asio/traits/start_member.hpp | 108 -- third_party/asio/asio/traits/static_query.hpp | 4 - .../asio/asio/traits/static_require.hpp | 4 - .../asio/traits/static_require_concept.hpp | 4 - third_party/asio/asio/traits/submit_free.hpp | 112 -- .../asio/asio/traits/submit_member.hpp | 112 -- third_party/asio/asio/ts/buffer.hpp | 4 - third_party/asio/asio/ts/executor.hpp | 4 - third_party/asio/asio/ts/internet.hpp | 4 - third_party/asio/asio/ts/io_context.hpp | 4 - third_party/asio/asio/ts/net.hpp | 4 - third_party/asio/asio/ts/netfwd.hpp | 4 - third_party/asio/asio/ts/socket.hpp | 4 - third_party/asio/asio/ts/timer.hpp | 4 - third_party/asio/asio/unyield.hpp | 4 - third_party/asio/asio/use_awaitable.hpp | 14 - third_party/asio/asio/use_future.hpp | 4 - third_party/asio/asio/uses_executor.hpp | 4 - third_party/asio/asio/version.hpp | 8 - third_party/asio/asio/wait_traits.hpp | 4 - .../asio/asio/windows/basic_object_handle.hpp | 51 - .../asio/windows/basic_overlapped_handle.hpp | 35 - .../windows/basic_random_access_handle.hpp | 79 -- .../asio/asio/windows/basic_stream_handle.hpp | 77 -- .../asio/asio/windows/object_handle.hpp | 4 - .../asio/asio/windows/overlapped_handle.hpp | 4 - .../asio/asio/windows/overlapped_ptr.hpp | 36 - .../asio/windows/random_access_handle.hpp | 4 - .../asio/asio/windows/stream_handle.hpp | 4 - third_party/asio/asio/writable_pipe.hpp | 4 - third_party/asio/asio/write.hpp | 275 ---- third_party/asio/asio/write_at.hpp | 105 -- third_party/asio/asio/yield.hpp | 4 - 658 files changed, 35180 deletions(-) delete mode 100644 third_party/asio/asio/detail/bulk_executor_op.hpp delete mode 100644 third_party/asio/asio/detail/gcc_arm_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/gcc_hppa_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/gcc_sync_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/gcc_x86_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/handler_invoke_helpers.hpp delete mode 100644 third_party/asio/asio/detail/macos_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/solaris_fenced_block.hpp delete mode 100644 third_party/asio/asio/detail/variadic_templates.hpp delete mode 100644 third_party/asio/asio/detail/win_fenced_block.hpp delete mode 100644 third_party/asio/asio/execution/bulk_execute.hpp delete mode 100644 third_party/asio/asio/execution/bulk_guarantee.hpp delete mode 100644 third_party/asio/asio/execution/connect.hpp delete mode 100644 third_party/asio/asio/execution/detail/as_invocable.hpp delete mode 100644 third_party/asio/asio/execution/detail/as_operation.hpp delete mode 100644 third_party/asio/asio/execution/detail/as_receiver.hpp delete mode 100644 third_party/asio/asio/execution/detail/bulk_sender.hpp delete mode 100644 third_party/asio/asio/execution/detail/submit_receiver.hpp delete mode 100644 third_party/asio/asio/execution/detail/void_receiver.hpp delete mode 100644 third_party/asio/asio/execution/execute.hpp delete mode 100644 third_party/asio/asio/execution/impl/receiver_invocation_error.ipp delete mode 100644 third_party/asio/asio/execution/operation_state.hpp delete mode 100644 third_party/asio/asio/execution/receiver.hpp delete mode 100644 third_party/asio/asio/execution/receiver_invocation_error.hpp delete mode 100644 third_party/asio/asio/execution/schedule.hpp delete mode 100644 third_party/asio/asio/execution/scheduler.hpp delete mode 100644 third_party/asio/asio/execution/sender.hpp delete mode 100644 third_party/asio/asio/execution/set_done.hpp delete mode 100644 third_party/asio/asio/execution/set_error.hpp delete mode 100644 third_party/asio/asio/execution/set_value.hpp delete mode 100644 third_party/asio/asio/execution/start.hpp delete mode 100644 third_party/asio/asio/execution/submit.hpp delete mode 100644 third_party/asio/asio/experimental/detail/channel_handler.hpp delete mode 100644 third_party/asio/asio/experimental/detail/channel_message.hpp delete mode 100644 third_party/asio/asio/experimental/detail/channel_payload.hpp delete mode 100644 third_party/asio/asio/experimental/detail/completion_handler_erasure.hpp delete mode 100644 third_party/asio/asio/handler_alloc_hook.hpp delete mode 100644 third_party/asio/asio/handler_invoke_hook.hpp delete mode 100644 third_party/asio/asio/impl/defer.hpp delete mode 100644 third_party/asio/asio/impl/dispatch.hpp delete mode 100644 third_party/asio/asio/impl/handler_alloc_hook.ipp delete mode 100644 third_party/asio/asio/impl/post.hpp delete mode 100644 third_party/asio/asio/traits/bulk_execute_free.hpp delete mode 100644 third_party/asio/asio/traits/bulk_execute_member.hpp delete mode 100644 third_party/asio/asio/traits/connect_free.hpp delete mode 100644 third_party/asio/asio/traits/connect_member.hpp delete mode 100644 third_party/asio/asio/traits/execute_free.hpp delete mode 100644 third_party/asio/asio/traits/schedule_free.hpp delete mode 100644 third_party/asio/asio/traits/schedule_member.hpp delete mode 100644 third_party/asio/asio/traits/set_done_free.hpp delete mode 100644 third_party/asio/asio/traits/set_done_member.hpp delete mode 100644 third_party/asio/asio/traits/set_error_free.hpp delete mode 100644 third_party/asio/asio/traits/set_error_member.hpp delete mode 100644 third_party/asio/asio/traits/set_value_free.hpp delete mode 100644 third_party/asio/asio/traits/set_value_member.hpp delete mode 100644 third_party/asio/asio/traits/start_free.hpp delete mode 100644 third_party/asio/asio/traits/start_member.hpp delete mode 100644 third_party/asio/asio/traits/submit_free.hpp delete mode 100644 third_party/asio/asio/traits/submit_member.hpp diff --git a/third_party/asio/asio.hpp b/third_party/asio/asio.hpp index 628368c..25cee47 100644 --- a/third_party/asio/asio.hpp +++ b/third_party/asio/asio.hpp @@ -2,11 +2,7 @@ // asio.hpp // ~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -19,22 +15,15 @@ # pragma once #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) -<<<<<<< HEAD -======= #include "asio/any_completion_executor.hpp" #include "asio/any_completion_handler.hpp" #include "asio/any_io_executor.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/append.hpp" #include "asio/as_tuple.hpp" #include "asio/associated_allocator.hpp" #include "asio/associated_cancellation_slot.hpp" #include "asio/associated_executor.hpp" -<<<<<<< HEAD -#include "asio/associated_cancellation_slot.hpp" -======= #include "asio/associated_immediate_executor.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/associator.hpp" #include "asio/async_result.hpp" #include "asio/awaitable.hpp" @@ -70,36 +59,24 @@ #include "asio/buffered_write_stream_fwd.hpp" #include "asio/buffered_write_stream.hpp" #include "asio/buffers_iterator.hpp" -<<<<<<< HEAD -#include "asio/cancellation_signal.hpp" -#include "asio/cancellation_state.hpp" -#include "asio/cancellation_type.hpp" -======= #include "asio/cancel_after.hpp" #include "asio/cancel_at.hpp" #include "asio/cancellation_signal.hpp" #include "asio/cancellation_state.hpp" #include "asio/cancellation_type.hpp" #include "asio/co_composed.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/co_spawn.hpp" #include "asio/completion_condition.hpp" #include "asio/compose.hpp" #include "asio/composed.hpp" #include "asio/connect.hpp" #include "asio/connect_pipe.hpp" -<<<<<<< HEAD -======= #include "asio/consign.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/coroutine.hpp" #include "asio/deadline_timer.hpp" #include "asio/defer.hpp" #include "asio/deferred.hpp" -<<<<<<< HEAD -======= #include "asio/default_completion_token.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/detached.hpp" #include "asio/dispatch.hpp" #include "asio/error.hpp" diff --git a/third_party/asio/asio/any_io_executor.hpp b/third_party/asio/asio/any_io_executor.hpp index fb2794e..d35acf4 100644 --- a/third_party/asio/asio/any_io_executor.hpp +++ b/third_party/asio/asio/any_io_executor.hpp @@ -2,11 +2,7 @@ // any_io_executor.hpp // ~~~~~~~~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -91,20 +87,6 @@ class any_io_executor : #endif // !defined(GENERATING_DOCUMENTATION) /// Default constructor. -<<<<<<< HEAD - ASIO_DECL any_io_executor() ASIO_NOEXCEPT; - - /// Construct in an empty state. Equivalent effects to default constructor. - ASIO_DECL any_io_executor(nullptr_t) ASIO_NOEXCEPT; - - /// Copy constructor. - ASIO_DECL any_io_executor(const any_io_executor& e) ASIO_NOEXCEPT; - -#if defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) - /// Move constructor. - ASIO_DECL any_io_executor(any_io_executor&& e) ASIO_NOEXCEPT; -#endif // defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) -======= ASIO_DECL any_io_executor() noexcept; /// Construct in an empty state. Equivalent effects to default constructor. @@ -115,7 +97,6 @@ class any_io_executor : /// Move constructor. ASIO_DECL any_io_executor(any_io_executor&& e) noexcept; ->>>>>>> 142038d (add asio new version) /// Construct to point to the same target as another any_executor. #if defined(GENERATING_DOCUMENTATION) @@ -124,13 +105,8 @@ class any_io_executor : #else // defined(GENERATING_DOCUMENTATION) template any_io_executor(OtherAnyExecutor e, -<<<<<<< HEAD - typename constraint< - conditional< -======= constraint_t< conditional_t< ->>>>>>> 142038d (add asio new version) !is_same::value && is_base_of::value, @@ -138,21 +114,13 @@ class any_io_executor : 0, supportable_properties_type>::template is_valid_target, false_type -<<<<<<< HEAD - >::type::value - >::type = 0) - : base_type(ASIO_MOVE_CAST(OtherAnyExecutor)(e)) -======= >::value > = 0) : base_type(static_cast(e)) ->>>>>>> 142038d (add asio new version) { } #endif // defined(GENERATING_DOCUMENTATION) -<<<<<<< HEAD -======= /// Construct to point to the same target as another any_executor. #if defined(GENERATING_DOCUMENTATION) template @@ -184,7 +152,6 @@ class any_io_executor : /// Construct to point to the same target as another any_executor. ASIO_DECL any_io_executor(std::nothrow_t, any_io_executor&& e) noexcept; ->>>>>>> 142038d (add asio new version) /// Construct a polymorphic wrapper for the specified executor. #if defined(GENERATING_DOCUMENTATION) template @@ -192,24 +159,14 @@ class any_io_executor : #else // defined(GENERATING_DOCUMENTATION) template any_io_executor(Executor e, -<<<<<<< HEAD - typename constraint< - conditional< -======= constraint_t< conditional_t< ->>>>>>> 142038d (add asio new version) !is_same::value && !is_base_of::value, execution::detail::is_valid_target_executor< Executor, supportable_properties_type>, false_type -<<<<<<< HEAD - >::type::value - >::type = 0) - : base_type(ASIO_MOVE_CAST(Executor)(e)) -======= >::value > = 0) : base_type(static_cast(e)) @@ -235,27 +192,16 @@ class any_io_executor : >::value > = 0) noexcept : base_type(std::nothrow, static_cast(e)) ->>>>>>> 142038d (add asio new version) { } #endif // defined(GENERATING_DOCUMENTATION) /// Assignment operator. ASIO_DECL any_io_executor& operator=( -<<<<<<< HEAD - const any_io_executor& e) ASIO_NOEXCEPT; - -#if defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) - /// Move assignment operator. - ASIO_DECL any_io_executor& operator=( - any_io_executor&& e) ASIO_NOEXCEPT; -#endif // defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) -======= const any_io_executor& e) noexcept; /// Move assignment operator. ASIO_DECL any_io_executor& operator=(any_io_executor&& e) noexcept; ->>>>>>> 142038d (add asio new version) /// Assignment operator that sets the polymorphic wrapper to the empty state. ASIO_DECL any_io_executor& operator=(nullptr_t); @@ -264,11 +210,7 @@ class any_io_executor : ASIO_DECL ~any_io_executor(); /// Swap targets with another polymorphic wrapper. -<<<<<<< HEAD - ASIO_DECL void swap(any_io_executor& other) ASIO_NOEXCEPT; -======= ASIO_DECL void swap(any_io_executor& other) noexcept; ->>>>>>> 142038d (add asio new version) /// Obtain a polymorphic wrapper with the specified property. /** @@ -281,15 +223,9 @@ class any_io_executor : */ template any_io_executor require(const Property& p, -<<<<<<< HEAD - typename constraint< - traits::require_member::is_valid - >::type = 0) const -======= constraint_t< traits::require_member::is_valid > = 0) const ->>>>>>> 142038d (add asio new version) { return static_cast(*this).require(p); } @@ -305,15 +241,9 @@ class any_io_executor : */ template any_io_executor prefer(const Property& p, -<<<<<<< HEAD - typename constraint< - traits::prefer_member::is_valid - >::type = 0) const -======= constraint_t< traits::prefer_member::is_valid > = 0) const ->>>>>>> 142038d (add asio new version) { return static_cast(*this).prefer(p); } diff --git a/third_party/asio/asio/append.hpp b/third_party/asio/asio/append.hpp index 45e716c..0460892 100644 --- a/third_party/asio/asio/append.hpp +++ b/third_party/asio/asio/append.hpp @@ -2,11 +2,7 @@ // append.hpp // ~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -20,14 +16,6 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include "asio/detail/config.hpp" -<<<<<<< HEAD - -#if (defined(ASIO_HAS_STD_TUPLE) \ - && defined(ASIO_HAS_VARIADIC_TEMPLATES)) \ - || defined(GENERATING_DOCUMENTATION) - -======= ->>>>>>> 142038d (add asio new version) #include #include "asio/detail/type_traits.hpp" @@ -44,17 +32,9 @@ class append_t public: /// Constructor. template -<<<<<<< HEAD - ASIO_CONSTEXPR explicit append_t( - ASIO_MOVE_ARG(T) completion_token, - ASIO_MOVE_ARG(V)... values) - : token_(ASIO_MOVE_CAST(T)(completion_token)), - values_(ASIO_MOVE_CAST(V)(values)...) -======= constexpr explicit append_t(T&& completion_token, V&&... values) : token_(static_cast(completion_token)), values_(static_cast(values)...) ->>>>>>> 142038d (add asio new version) { } @@ -67,17 +47,6 @@ class append_t /// arguments should be passed additional values after the results of the /// operation. template -<<<<<<< HEAD -ASIO_NODISCARD inline ASIO_CONSTEXPR append_t< - typename decay::type, typename decay::type...> -append(ASIO_MOVE_ARG(CompletionToken) completion_token, - ASIO_MOVE_ARG(Values)... values) -{ - return append_t< - typename decay::type, typename decay::type...>( - ASIO_MOVE_CAST(CompletionToken)(completion_token), - ASIO_MOVE_CAST(Values)(values)...); -======= ASIO_NODISCARD inline constexpr append_t, decay_t...> append(CompletionToken&& completion_token, Values&&... values) @@ -85,7 +54,6 @@ append(CompletionToken&& completion_token, Values&&... values) return append_t, decay_t...>( static_cast(completion_token), static_cast(values)...); ->>>>>>> 142038d (add asio new version) } } // namespace asio @@ -94,11 +62,4 @@ append(CompletionToken&& completion_token, Values&&... values) #include "asio/impl/append.hpp" -<<<<<<< HEAD -#endif // (defined(ASIO_HAS_STD_TUPLE) - // && defined(ASIO_HAS_VARIADIC_TEMPLATES)) - // || defined(GENERATING_DOCUMENTATION) - -======= ->>>>>>> 142038d (add asio new version) #endif // ASIO_APPEND_HPP diff --git a/third_party/asio/asio/as_tuple.hpp b/third_party/asio/asio/as_tuple.hpp index 0d907b9..0104288 100644 --- a/third_party/asio/asio/as_tuple.hpp +++ b/third_party/asio/asio/as_tuple.hpp @@ -2,11 +2,7 @@ // as_tuple.hpp // ~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -20,14 +16,6 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include "asio/detail/config.hpp" -<<<<<<< HEAD - -#if (defined(ASIO_HAS_STD_TUPLE) \ - && defined(ASIO_HAS_VARIADIC_TEMPLATES)) \ - || defined(GENERATING_DOCUMENTATION) - -======= ->>>>>>> 142038d (add asio new version) #include "asio/detail/type_traits.hpp" #include "asio/detail/push_options.hpp" @@ -57,31 +45,18 @@ class as_tuple_t * token is itself defaulted as an argument to allow it to capture a source * location. */ -<<<<<<< HEAD - ASIO_CONSTEXPR as_tuple_t( - default_constructor_tag = default_constructor_tag(), - CompletionToken token = CompletionToken()) - : token_(ASIO_MOVE_CAST(CompletionToken)(token)) -======= constexpr as_tuple_t( default_constructor_tag = default_constructor_tag(), CompletionToken token = CompletionToken()) : token_(static_cast(token)) ->>>>>>> 142038d (add asio new version) { } /// Constructor. template -<<<<<<< HEAD - ASIO_CONSTEXPR explicit as_tuple_t( - ASIO_MOVE_ARG(T) completion_token) - : token_(ASIO_MOVE_CAST(T)(completion_token)) -======= constexpr explicit as_tuple_t( T&& completion_token) : token_(static_cast(completion_token)) ->>>>>>> 142038d (add asio new version) { } @@ -96,15 +71,6 @@ class as_tuple_t /// Construct the adapted executor from the inner executor type. template executor_with_default(const InnerExecutor1& ex, -<<<<<<< HEAD - typename constraint< - conditional< - !is_same::value, - is_convertible, - false_type - >::type::value - >::type = 0) ASIO_NOEXCEPT -======= constraint_t< conditional_t< !is_same::value, @@ -112,7 +78,6 @@ class as_tuple_t false_type >::value > = 0) noexcept ->>>>>>> 142038d (add asio new version) : InnerExecutor(ex) { } @@ -120,33 +85,13 @@ class as_tuple_t /// Type alias to adapt an I/O object to use @c as_tuple_t as its /// default completion token type. -<<<<<<< HEAD -#if defined(ASIO_HAS_ALIAS_TEMPLATES) \ - || defined(GENERATING_DOCUMENTATION) - template - using as_default_on_t = typename T::template rebind_executor< - executor_with_default >::other; -#endif // defined(ASIO_HAS_ALIAS_TEMPLATES) - // || defined(GENERATING_DOCUMENTATION) -======= template using as_default_on_t = typename T::template rebind_executor< executor_with_default>::other; ->>>>>>> 142038d (add asio new version) /// Function helper to adapt an I/O object to use @c as_tuple_t as its /// default completion token type. template -<<<<<<< HEAD - static typename decay::type::template rebind_executor< - executor_with_default::type::executor_type> - >::other - as_default_on(ASIO_MOVE_ARG(T) object) - { - return typename decay::type::template rebind_executor< - executor_with_default::type::executor_type> - >::other(ASIO_MOVE_CAST(T)(object)); -======= static typename decay_t::template rebind_executor< executor_with_default::executor_type> >::other @@ -155,25 +100,12 @@ class as_tuple_t return typename decay_t::template rebind_executor< executor_with_default::executor_type> >::other(static_cast(object)); ->>>>>>> 142038d (add asio new version) } //private: CompletionToken token_; }; -<<<<<<< HEAD -/// Adapt a @ref completion_token to specify that the completion handler -/// arguments should be combined into a single tuple argument. -template -ASIO_NODISCARD inline -ASIO_CONSTEXPR as_tuple_t::type> -as_tuple(ASIO_MOVE_ARG(CompletionToken) completion_token) -{ - return as_tuple_t::type>( - ASIO_MOVE_CAST(CompletionToken)(completion_token)); -} -======= /// A function object type that adapts a @ref completion_token to specify that /// the completion handler arguments should be combined into a single tuple /// argument. @@ -210,7 +142,6 @@ struct partial_as_tuple * if no default is available). */ constexpr partial_as_tuple as_tuple; ->>>>>>> 142038d (add asio new version) } // namespace asio @@ -218,11 +149,4 @@ constexpr partial_as_tuple as_tuple; #include "asio/impl/as_tuple.hpp" -<<<<<<< HEAD -#endif // (defined(ASIO_HAS_STD_TUPLE) - // && defined(ASIO_HAS_VARIADIC_TEMPLATES)) - // || defined(GENERATING_DOCUMENTATION) - -======= ->>>>>>> 142038d (add asio new version) #endif // ASIO_AS_TUPLE_HPP diff --git a/third_party/asio/asio/associated_allocator.hpp b/third_party/asio/asio/associated_allocator.hpp index e99c469..f21ea25 100644 --- a/third_party/asio/asio/associated_allocator.hpp +++ b/third_party/asio/asio/associated_allocator.hpp @@ -2,11 +2,7 @@ // associated_allocator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -40,21 +36,11 @@ struct has_allocator_type : false_type }; template -<<<<<<< HEAD -struct has_allocator_type::type> - : true_type -{ -}; - -template -======= struct has_allocator_type> : true_type { }; template ->>>>>>> 142038d (add asio new version) struct associated_allocator_impl { typedef void asio_associated_allocator_is_unspecialised; @@ -101,17 +87,6 @@ struct associated_allocator_impl -struct associated_allocator_impl::value - >::type, - typename void_type< - typename associator::type - >::type> : associator -{ -}; - } // namespace detail /// Traits type used to obtain the allocator associated with an object. @@ -162,11 +137,7 @@ struct associated_allocator */ template ASIO_NODISCARD inline typename associated_allocator::type -<<<<<<< HEAD -get_associated_allocator(const T& t) ASIO_NOEXCEPT -======= get_associated_allocator(const T& t) noexcept ->>>>>>> 142038d (add asio new version) { return associated_allocator::get(t); } @@ -176,14 +147,9 @@ get_associated_allocator(const T& t) noexcept * @returns associated_allocator::get(t, a) */ template -<<<<<<< HEAD -ASIO_NODISCARD inline typename associated_allocator::type -get_associated_allocator(const T& t, const Allocator& a) ASIO_NOEXCEPT -======= ASIO_NODISCARD inline auto get_associated_allocator( const T& t, const Allocator& a) noexcept -> decltype(associated_allocator::get(t, a)) ->>>>>>> 142038d (add asio new version) { return associated_allocator::get(t, a); } @@ -241,29 +207,6 @@ struct associated_allocator, Allocator> } }; -#if defined(ASIO_HAS_STD_REFERENCE_WRAPPER) \ - || defined(GENERATING_DOCUMENTATION) - -/// Specialisation of associated_allocator for @c std::reference_wrapper. -template -struct associated_allocator, Allocator> -{ - /// Forwards @c type to the associator specialisation for the unwrapped type - /// @c T. - typedef typename associated_allocator::type type; - - /// Forwards the request to get the allocator to the associator specialisation - /// for the unwrapped type @c T. - static type get(reference_wrapper t, - const Allocator& a = Allocator()) ASIO_NOEXCEPT - { - return associated_allocator::get(t.get(), a); - } -}; - -#endif // defined(ASIO_HAS_STD_REFERENCE_WRAPPER) - // || defined(GENERATING_DOCUMENTATION) - } // namespace asio #include "asio/detail/pop_options.hpp" diff --git a/third_party/asio/asio/associated_cancellation_slot.hpp b/third_party/asio/asio/associated_cancellation_slot.hpp index 6878fe6..518bd88 100644 --- a/third_party/asio/asio/associated_cancellation_slot.hpp +++ b/third_party/asio/asio/associated_cancellation_slot.hpp @@ -2,11 +2,7 @@ // associated_cancellation_slot.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -22,10 +18,7 @@ #include "asio/detail/config.hpp" #include "asio/associator.hpp" #include "asio/cancellation_signal.hpp" -<<<<<<< HEAD -======= #include "asio/detail/functional.hpp" ->>>>>>> 142038d (add asio new version) #include "asio/detail/type_traits.hpp" #include "asio/detail/push_options.hpp" @@ -43,14 +36,8 @@ struct has_cancellation_slot_type : false_type }; template -<<<<<<< HEAD -struct has_cancellation_slot_type::type> - : true_type -======= struct has_cancellation_slot_type> : true_type ->>>>>>> 142038d (add asio new version) { }; @@ -61,16 +48,12 @@ struct associated_cancellation_slot_impl typedef S type; -<<<<<<< HEAD - static type get(const T&, const S& s = S()) ASIO_NOEXCEPT -======= static type get(const T&) noexcept { return type(); } static const type& get(const T&, const S& s) noexcept ->>>>>>> 142038d (add asio new version) { return s; } @@ -78,13 +61,6 @@ struct associated_cancellation_slot_impl template struct associated_cancellation_slot_impl::type> -{ - typedef typename T::cancellation_slot_type type; - - static type get(const T& t, const S& = S()) ASIO_NOEXCEPT -======= void_t> { typedef typename T::cancellation_slot_type type; @@ -97,7 +73,6 @@ struct associated_cancellation_slot_impl decltype(t.get_cancellation_slot()) ->>>>>>> 142038d (add asio new version) { return t.get_cancellation_slot(); } @@ -105,21 +80,12 @@ struct associated_cancellation_slot_impl struct associated_cancellation_slot_impl::value - >::type, - typename void_type< - typename associator::type - >::type> : associator -======= enable_if_t< !has_cancellation_slot_type::value >, void_t< typename associator::type >> : associator ->>>>>>> 142038d (add asio new version) { }; @@ -139,19 +105,12 @@ struct associated_cancellation_slot_impl>>>>>> 142038d (add asio new version) */ template struct associated_cancellation_slot @@ -166,11 +125,6 @@ struct associated_cancellation_slot typedef see_below type; /// If @c T has a nested type @c cancellation_slot_type, returns -<<<<<<< HEAD - /// t.get_cancellation_slot(). Otherwise returns @c s. - static type get(const T& t, - const CancellationSlot& s = CancellationSlot()) ASIO_NOEXCEPT; -======= /// t.get_cancellation_slot(). Otherwise returns @c type(). static decltype(auto) get(const T& t) noexcept; @@ -178,7 +132,6 @@ struct associated_cancellation_slot /// t.get_cancellation_slot(). Otherwise returns @c s. static decltype(auto) get(const T& t, const CancellationSlot& s) noexcept; ->>>>>>> 142038d (add asio new version) #endif // defined(GENERATING_DOCUMENTATION) }; @@ -188,11 +141,7 @@ struct associated_cancellation_slot */ template ASIO_NODISCARD inline typename associated_cancellation_slot::type -<<<<<<< HEAD -get_associated_cancellation_slot(const T& t) ASIO_NOEXCEPT -======= get_associated_cancellation_slot(const T& t) noexcept ->>>>>>> 142038d (add asio new version) { return associated_cancellation_slot::get(t); } @@ -203,34 +152,17 @@ get_associated_cancellation_slot(const T& t) noexcept * CancellationSlot>::get(t, st) */ template -<<<<<<< HEAD -ASIO_NODISCARD inline -typename associated_cancellation_slot::type -get_associated_cancellation_slot(const T& t, - const CancellationSlot& st) ASIO_NOEXCEPT -======= ASIO_NODISCARD inline auto get_associated_cancellation_slot( const T& t, const CancellationSlot& st) noexcept -> decltype(associated_cancellation_slot::get(t, st)) ->>>>>>> 142038d (add asio new version) { return associated_cancellation_slot::get(t, st); } -<<<<<<< HEAD -#if defined(ASIO_HAS_ALIAS_TEMPLATES) - -======= ->>>>>>> 142038d (add asio new version) template using associated_cancellation_slot_t = typename associated_cancellation_slot::type; -<<<<<<< HEAD -#endif // defined(ASIO_HAS_ALIAS_TEMPLATES) - -======= ->>>>>>> 142038d (add asio new version) namespace detail { template @@ -240,28 +172,18 @@ struct associated_cancellation_slot_forwarding_base template struct associated_cancellation_slot_forwarding_base>>>>>> 142038d (add asio new version) is_same< typename associated_cancellation_slot::asio_associated_cancellation_slot_is_unspecialised, void >::value -<<<<<<< HEAD - >::type> -======= >> ->>>>>>> 142038d (add asio new version) { typedef void asio_associated_cancellation_slot_is_unspecialised; }; } // namespace detail -<<<<<<< HEAD -======= /// Specialisation of associated_cancellation_slot for @c /// std::reference_wrapper. @@ -292,7 +214,6 @@ struct associated_cancellation_slot, CancellationSlot> } }; ->>>>>>> 142038d (add asio new version) } // namespace asio #include "asio/detail/pop_options.hpp" diff --git a/third_party/asio/asio/associated_executor.hpp b/third_party/asio/asio/associated_executor.hpp index 902c8ef..4ca7ba1 100644 --- a/third_party/asio/asio/associated_executor.hpp +++ b/third_party/asio/asio/associated_executor.hpp @@ -2,11 +2,7 @@ // associated_executor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -42,12 +38,7 @@ struct has_executor_type : false_type }; template -<<<<<<< HEAD -struct has_executor_type::type> -======= struct has_executor_type> ->>>>>>> 142038d (add asio new version) : true_type { }; @@ -99,17 +90,6 @@ struct associated_executor_impl -struct associated_executor_impl::value - >::type, - typename void_type< - typename associator::type - >::type> : associator -{ -}; - } // namespace detail /// Traits type used to obtain the executor associated with an object. @@ -160,11 +140,7 @@ struct associated_executor */ template ASIO_NODISCARD inline typename associated_executor::type -<<<<<<< HEAD -get_associated_executor(const T& t) ASIO_NOEXCEPT -======= get_associated_executor(const T& t) noexcept ->>>>>>> 142038d (add asio new version) { return associated_executor::get(t); } @@ -174,20 +150,12 @@ get_associated_executor(const T& t) noexcept * @returns associated_executor::get(t, ex) */ template -<<<<<<< HEAD -ASIO_NODISCARD inline typename associated_executor::type -get_associated_executor(const T& t, const Executor& ex, - typename constraint< - is_executor::value || execution::is_executor::value - >::type = 0) ASIO_NOEXCEPT -======= ASIO_NODISCARD inline auto get_associated_executor( const T& t, const Executor& ex, constraint_t< is_executor::value || execution::is_executor::value > = 0) noexcept -> decltype(associated_executor::get(t, ex)) ->>>>>>> 142038d (add asio new version) { return associated_executor::get(t, ex); } @@ -199,17 +167,10 @@ ASIO_NODISCARD inline auto get_associated_executor( */ template ASIO_NODISCARD inline typename associated_executor::type -get_associated_executor(const T& t, ExecutionContext& ctx, - typename constraint::value>::type = 0) ASIO_NOEXCEPT -======= typename ExecutionContext::executor_type>::type get_associated_executor(const T& t, ExecutionContext& ctx, constraint_t::value> = 0) noexcept ->>>>>>> 142038d (add asio new version) { return associated_executor::get(t, ctx.get_executor()); @@ -240,12 +201,6 @@ struct associated_executor_forwarding_base>>>>>> 142038d (add asio new version) /// Specialisation of associated_executor for @c std::reference_wrapper. template struct associated_executor, Executor> @@ -259,10 +214,6 @@ struct associated_executor, Executor> /// Forwards the request to get the executor to the associator specialisation /// for the unwrapped type @c T. -<<<<<<< HEAD - static type get(reference_wrapper t, - const Executor& ex = Executor()) ASIO_NOEXCEPT -======= static type get(reference_wrapper t) noexcept { return associated_executor::get(t.get()); @@ -272,18 +223,11 @@ struct associated_executor, Executor> /// for the unwrapped type @c T. static auto get(reference_wrapper t, const Executor& ex) noexcept -> decltype(associated_executor::get(t.get(), ex)) ->>>>>>> 142038d (add asio new version) { return associated_executor::get(t.get(), ex); } }; -<<<<<<< HEAD -#endif // defined(ASIO_HAS_STD_REFERENCE_WRAPPER) - // || defined(GENERATING_DOCUMENTATION) - -======= ->>>>>>> 142038d (add asio new version) } // namespace asio #include "asio/detail/pop_options.hpp" diff --git a/third_party/asio/asio/associator.hpp b/third_party/asio/asio/associator.hpp index f89eeea..fbc9769 100644 --- a/third_party/asio/asio/associator.hpp +++ b/third_party/asio/asio/associator.hpp @@ -2,11 +2,7 @@ // associator.hpp // ~~~~~~~~~~~~~~ // -<<<<<<< HEAD -// Copyright (c) 2003-2022 Christopher M. Kohlhoff (chris at kohlhoff dot com) -======= // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com) ->>>>>>> 142038d (add asio new version) // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -27,11 +23,7 @@ namespace asio { /// Used to generically specialise associators for a type. template