Skip to content

Commit

Permalink
Merge branch 'chriskohlhoff:master' into zig-pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
kassane authored Jul 10, 2024
2 parents 65d0da3 + 54e3a84 commit 98b031a
Show file tree
Hide file tree
Showing 50 changed files with 3,932 additions and 1,099 deletions.
1 change: 1 addition & 0 deletions asio/include/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ nobase_include_HEADERS = \
asio/handler_continuation_hook.hpp \
asio/high_resolution_timer.hpp \
asio.hpp \
asio/immediate.hpp \
asio/impl/any_completion_executor.ipp \
asio/impl/any_io_executor.ipp \
asio/impl/append.hpp \
Expand Down
1 change: 1 addition & 0 deletions asio/include/asio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
#include "asio/generic/stream_protocol.hpp"
#include "asio/handler_continuation_hook.hpp"
#include "asio/high_resolution_timer.hpp"
#include "asio/immediate.hpp"
#include "asio/io_context.hpp"
#include "asio/io_context_strand.hpp"
#include "asio/io_service.hpp"
Expand Down
2 changes: 1 addition & 1 deletion asio/include/asio/associator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace asio {

/// Used to generically specialise associators for a type.
template <template <typename, typename> class Associator,
typename T, typename DefaultCandidate>
typename T, typename DefaultCandidate, typename _ = void>
struct associator
{
};
Expand Down
16 changes: 8 additions & 8 deletions asio/include/asio/basic_datagram_socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -517,7 +517,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -666,7 +666,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -739,7 +739,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -884,7 +884,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -955,7 +955,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -1107,7 +1107,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -1179,7 +1179,7 @@ class basic_datagram_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
2 changes: 1 addition & 1 deletion asio/include/asio/basic_deadline_timer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ class basic_deadline_timer
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down
4 changes: 2 additions & 2 deletions asio/include/asio/basic_random_access_file.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ class basic_random_access_file
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -562,7 +562,7 @@ class basic_random_access_file
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
16 changes: 8 additions & 8 deletions asio/include/asio/basic_raw_socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -509,7 +509,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -658,7 +658,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -731,7 +731,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -876,7 +876,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -947,7 +947,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -1100,7 +1100,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -1173,7 +1173,7 @@ class basic_raw_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
2 changes: 1 addition & 1 deletion asio/include/asio/basic_readable_pipe.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ class basic_readable_pipe
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
6 changes: 3 additions & 3 deletions asio/include/asio/basic_seq_packet_socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ class basic_seq_packet_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -620,7 +620,7 @@ class basic_seq_packet_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -694,7 +694,7 @@ class basic_seq_packet_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
4 changes: 2 additions & 2 deletions asio/include/asio/basic_serial_port.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ class basic_serial_port
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -854,7 +854,7 @@ class basic_serial_port
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
2 changes: 1 addition & 1 deletion asio/include/asio/basic_signal_set.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ class basic_signal_set : public signal_set_base
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, int) @endcode
Expand Down
4 changes: 2 additions & 2 deletions asio/include/asio/basic_socket.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ class basic_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down Expand Up @@ -1779,7 +1779,7 @@ class basic_socket
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down
18 changes: 9 additions & 9 deletions asio/include/asio/basic_socket_acceptor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down Expand Up @@ -1348,7 +1348,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down Expand Up @@ -1496,7 +1496,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code) @endcode
Expand Down Expand Up @@ -1616,7 +1616,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down Expand Up @@ -1866,7 +1866,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down Expand Up @@ -1962,7 +1962,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down Expand Up @@ -2132,7 +2132,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down Expand Up @@ -2414,7 +2414,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down Expand Up @@ -2514,7 +2514,7 @@ class basic_socket_acceptor
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code,
Expand Down
4 changes: 2 additions & 2 deletions asio/include/asio/basic_stream_file.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ class basic_stream_file
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down Expand Up @@ -618,7 +618,7 @@ class basic_stream_file
* Regardless of whether the asynchronous operation completes immediately or
* not, the completion handler will not be invoked from within this function.
* On immediate completion, invocation of the handler will be performed in a
* manner equivalent to using asio::post().
* manner equivalent to using asio::async_immediate().
*
* @par Completion Signature
* @code void(asio::error_code, std::size_t) @endcode
Expand Down
Loading

0 comments on commit 98b031a

Please sign in to comment.