Google Git
Sign in
mojo/asio/7c5d7469b36f0b09e2960c5958a97ba903b963bd^!/.
commit
7c5d7469b36f0b09e2960c5958a97ba903b963bd
[log]
author
chris_kohlhoff <chris_kohlhoff>
Sat Oct 16 00:58:13 2010 +0000
committer
chris_kohlhoff <chris_kohlhoff>
Sat Oct 16 00:58:13 2010 +0000
tree
a4cecf3bab0484ca464a0b19f7e8b41688f7381a
parent
d9bce0d95cf263dab007d1d74fd5af38dd4ffe84 [diff]
asio version 1.4.6 released

diff --git a/asio/README b/asio/README
index 474855e..08b852f 100644
--- a/asio/README
+++ b/asio/README

@@ -1,4 +1,4 @@
-asio version 1.4.5
-Released Wednesday, 12 May 2010.
+asio version 1.4.6
+Released Saturday, 16 October 2010.
 
 See doc/index.html for API documentation and a tutorial.

diff --git a/asio/asio.manifest b/asio/asio.manifest
index 8e2d904..022bd2e 100644
--- a/asio/asio.manifest
+++ b/asio/asio.manifest

@@ -1079,8 +1079,11 @@
 /doc/asio/reference/buffers_iterator/operator_minus_/overload1.html
 /doc/asio/reference/buffers_iterator/operator_minus_/overload2.html
 /doc/asio/reference/buffers_iterator/operator_not__eq_.html
+/doc/asio/reference/buffers_iterator/operator_plus_/
 /doc/asio/reference/buffers_iterator/operator_plus__eq_.html
 /doc/asio/reference/buffers_iterator/operator_plus_.html
+/doc/asio/reference/buffers_iterator/operator_plus_/overload1.html
+/doc/asio/reference/buffers_iterator/operator_plus_/overload2.html
 /doc/asio/reference/buffers_iterator/operator_plus__plus_/
 /doc/asio/reference/buffers_iterator/operator_plus__plus_.html
 /doc/asio/reference/buffers_iterator/operator_plus__plus_/overload1.html
@@ -1315,6 +1318,9 @@
 /doc/asio/reference/ip__address/operator_eq_/overload1.html
 /doc/asio/reference/ip__address/operator_eq_/overload2.html
 /doc/asio/reference/ip__address/operator_eq_/overload3.html
+/doc/asio/reference/ip__address/operator_gt__eq_.html
+/doc/asio/reference/ip__address/operator_gt_.html
+/doc/asio/reference/ip__address/operator_lt__eq_.html
 /doc/asio/reference/ip__address/operator_lt_.html
 /doc/asio/reference/ip__address/operator_lt__lt_.html
 /doc/asio/reference/ip__address/operator_not__eq_.html
@@ -1432,6 +1438,9 @@
 /doc/asio/reference/ip__basic_endpoint.html
 /doc/asio/reference/ip__basic_endpoint/operator_eq__eq_.html
 /doc/asio/reference/ip__basic_endpoint/operator_eq_.html
+/doc/asio/reference/ip__basic_endpoint/operator_gt__eq_.html
+/doc/asio/reference/ip__basic_endpoint/operator_gt_.html
+/doc/asio/reference/ip__basic_endpoint/operator_lt__eq_.html
 /doc/asio/reference/ip__basic_endpoint/operator_lt_.html
 /doc/asio/reference/ip__basic_endpoint/operator_lt__lt_.html
 /doc/asio/reference/ip__basic_endpoint/operator_not__eq_.html
@@ -1629,6 +1638,9 @@
 /doc/asio/reference/local__basic_endpoint.html
 /doc/asio/reference/local__basic_endpoint/operator_eq__eq_.html
 /doc/asio/reference/local__basic_endpoint/operator_eq_.html
+/doc/asio/reference/local__basic_endpoint/operator_gt__eq_.html
+/doc/asio/reference/local__basic_endpoint/operator_gt_.html
+/doc/asio/reference/local__basic_endpoint/operator_lt__eq_.html
 /doc/asio/reference/local__basic_endpoint/operator_lt_.html
 /doc/asio/reference/local__basic_endpoint/operator_lt__lt_.html
 /doc/asio/reference/local__basic_endpoint/operator_not__eq_.html
@@ -2511,6 +2523,7 @@
 /include/asio/basic_socket.hpp
 /include/asio/basic_socket_iostream.hpp
 /include/asio/basic_socket_streambuf.hpp
+/include/asio/basic_streambuf_fwd.hpp
 /include/asio/basic_streambuf.hpp
 /include/asio/basic_stream_socket.hpp
 /include/asio/buffered_read_stream_fwd.hpp
@@ -2526,6 +2539,7 @@
 /include/asio/deadline_timer.hpp
 /include/asio/deadline_timer_service.hpp
 /include/asio/detail/
+/include/asio/detail/array_fwd.hpp
 /include/asio/detail/base_from_completion_cond.hpp
 /include/asio/detail/bind_handler.hpp
 /include/asio/detail/buffered_stream_storage.hpp
@@ -2533,9 +2547,12 @@
 /include/asio/detail/buffer_sequence_adapter.hpp
 /include/asio/detail/call_stack.hpp
 /include/asio/detail/completion_handler.hpp
+/include/asio/detail/config.hpp
 /include/asio/detail/consuming_buffers.hpp
 /include/asio/detail/deadline_timer_service.hpp
 /include/asio/detail/descriptor_ops.hpp
+/include/asio/detail/descriptor_read_op.hpp
+/include/asio/detail/descriptor_write_op.hpp
 /include/asio/detail/dev_poll_reactor_fwd.hpp
 /include/asio/detail/dev_poll_reactor.hpp
 /include/asio/detail/epoll_reactor_fwd.hpp
@@ -2544,11 +2561,54 @@
 /include/asio/detail/event.hpp
 /include/asio/detail/fd_set_adapter.hpp
 /include/asio/detail/fenced_block.hpp
-/include/asio/detail/gcc_fenced_block.hpp
+/include/asio/detail/gcc_arm_fenced_block.hpp
+/include/asio/detail/gcc_hppa_fenced_block.hpp
+/include/asio/detail/gcc_sync_fenced_block.hpp
 /include/asio/detail/gcc_x86_fenced_block.hpp
 /include/asio/detail/handler_alloc_helpers.hpp
 /include/asio/detail/handler_invoke_helpers.hpp
 /include/asio/detail/hash_map.hpp
+/include/asio/detail/impl/
+/include/asio/detail/impl/descriptor_ops.ipp
+/include/asio/detail/impl/dev_poll_reactor.hpp
+/include/asio/detail/impl/dev_poll_reactor.ipp
+/include/asio/detail/impl/epoll_reactor.hpp
+/include/asio/detail/impl/epoll_reactor.ipp
+/include/asio/detail/impl/eventfd_select_interrupter.ipp
+/include/asio/detail/impl/kqueue_reactor.hpp
+/include/asio/detail/impl/kqueue_reactor.ipp
+/include/asio/detail/impl/pipe_select_interrupter.ipp
+/include/asio/detail/impl/posix_event.ipp
+/include/asio/detail/impl/posix_mutex.ipp
+/include/asio/detail/impl/posix_thread.ipp
+/include/asio/detail/impl/posix_tss_ptr.ipp
+/include/asio/detail/impl/reactive_descriptor_service.ipp
+/include/asio/detail/impl/reactive_serial_port_service.ipp
+/include/asio/detail/impl/reactive_socket_service_base.ipp
+/include/asio/detail/impl/resolver_service_base.ipp
+/include/asio/detail/impl/select_reactor.hpp
+/include/asio/detail/impl/select_reactor.ipp
+/include/asio/detail/impl/service_registry.hpp
+/include/asio/detail/impl/service_registry.ipp
+/include/asio/detail/impl/socket_ops.ipp
+/include/asio/detail/impl/socket_select_interrupter.ipp
+/include/asio/detail/impl/strand_service.hpp
+/include/asio/detail/impl/strand_service.ipp
+/include/asio/detail/impl/task_io_service.hpp
+/include/asio/detail/impl/task_io_service.ipp
+/include/asio/detail/impl/throw_error.ipp
+/include/asio/detail/impl/timer_queue.ipp
+/include/asio/detail/impl/timer_queue_set.ipp
+/include/asio/detail/impl/win_event.ipp
+/include/asio/detail/impl/win_iocp_handle_service.ipp
+/include/asio/detail/impl/win_iocp_io_service.hpp
+/include/asio/detail/impl/win_iocp_io_service.ipp
+/include/asio/detail/impl/win_iocp_serial_port_service.ipp
+/include/asio/detail/impl/win_iocp_socket_service_base.ipp
+/include/asio/detail/impl/win_mutex.ipp
+/include/asio/detail/impl/winsock_init.ipp
+/include/asio/detail/impl/win_thread.ipp
+/include/asio/detail/impl/win_tss_ptr.ipp
 /include/asio/detail/io_control.hpp
 /include/asio/detail/kqueue_reactor_fwd.hpp
 /include/asio/detail/kqueue_reactor.hpp
@@ -2556,13 +2616,13 @@
 /include/asio/detail/macos_fenced_block.hpp
 /include/asio/detail/mutex.hpp
 /include/asio/detail/noncopyable.hpp
-/include/asio/detail/null_buffers_op.hpp
 /include/asio/detail/null_event.hpp
 /include/asio/detail/null_fenced_block.hpp
 /include/asio/detail/null_mutex.hpp
 /include/asio/detail/null_signal_blocker.hpp
 /include/asio/detail/null_thread.hpp
 /include/asio/detail/null_tss_ptr.hpp
+/include/asio/detail/object_pool.hpp
 /include/asio/detail/old_win_sdk_compat.hpp
 /include/asio/detail/operation.hpp
 /include/asio/detail/op_queue.hpp
@@ -2576,21 +2636,32 @@
 /include/asio/detail/posix_tss_ptr.hpp
 /include/asio/detail/push_options.hpp
 /include/asio/detail/reactive_descriptor_service.hpp
+/include/asio/detail/reactive_null_buffers_op.hpp
 /include/asio/detail/reactive_serial_port_service.hpp
+/include/asio/detail/reactive_socket_accept_op.hpp
+/include/asio/detail/reactive_socket_connect_op.hpp
+/include/asio/detail/reactive_socket_recvfrom_op.hpp
+/include/asio/detail/reactive_socket_recv_op.hpp
+/include/asio/detail/reactive_socket_send_op.hpp
+/include/asio/detail/reactive_socket_sendto_op.hpp
+/include/asio/detail/reactive_socket_service_base.hpp
 /include/asio/detail/reactive_socket_service.hpp
 /include/asio/detail/reactor_fwd.hpp
 /include/asio/detail/reactor.hpp
 /include/asio/detail/reactor_op.hpp
 /include/asio/detail/reactor_op_queue.hpp
+/include/asio/detail/regex_fwd.hpp
+/include/asio/detail/resolve_endpoint_op.hpp
+/include/asio/detail/resolve_op.hpp
+/include/asio/detail/resolver_service_base.hpp
 /include/asio/detail/resolver_service.hpp
 /include/asio/detail/scoped_lock.hpp
 /include/asio/detail/select_interrupter.hpp
 /include/asio/detail/select_reactor_fwd.hpp
 /include/asio/detail/select_reactor.hpp
-/include/asio/detail/service_base.hpp
-/include/asio/detail/service_id.hpp
 /include/asio/detail/service_registry_fwd.hpp
 /include/asio/detail/service_registry.hpp
+/include/asio/detail/shared_ptr.hpp
 /include/asio/detail/signal_blocker.hpp
 /include/asio/detail/signal_init.hpp
 /include/asio/detail/socket_holder.hpp
@@ -2613,19 +2684,29 @@
 /include/asio/detail/timer_scheduler_fwd.hpp
 /include/asio/detail/timer_scheduler.hpp
 /include/asio/detail/tss_ptr.hpp
+/include/asio/detail/wait_handler.hpp
+/include/asio/detail/weak_ptr.hpp
 /include/asio/detail/wince_thread.hpp
 /include/asio/detail/win_event.hpp
 /include/asio/detail/win_fd_set_adapter.hpp
 /include/asio/detail/win_fenced_block.hpp
+/include/asio/detail/win_iocp_handle_read_op.hpp
 /include/asio/detail/win_iocp_handle_service.hpp
+/include/asio/detail/win_iocp_handle_write_op.hpp
 /include/asio/detail/win_iocp_io_service_fwd.hpp
 /include/asio/detail/win_iocp_io_service.hpp
+/include/asio/detail/win_iocp_null_buffers_op.hpp
 /include/asio/detail/win_iocp_operation.hpp
+/include/asio/detail/win_iocp_overlapped_op.hpp
 /include/asio/detail/win_iocp_overlapped_ptr.hpp
 /include/asio/detail/win_iocp_serial_port_service.hpp
+/include/asio/detail/win_iocp_socket_accept_op.hpp
+/include/asio/detail/win_iocp_socket_recvfrom_op.hpp
+/include/asio/detail/win_iocp_socket_recv_op.hpp
+/include/asio/detail/win_iocp_socket_send_op.hpp
+/include/asio/detail/win_iocp_socket_service_base.hpp
 /include/asio/detail/win_iocp_socket_service.hpp
 /include/asio/detail/win_mutex.hpp
-/include/asio/detail/win_signal_blocker.hpp
 /include/asio/detail/winsock_init.hpp
 /include/asio/detail/win_thread.hpp
 /include/asio/detail/win_tss_ptr.hpp
@@ -2637,13 +2718,17 @@
 /include/asio.hpp
 /include/asio/impl/
 /include/asio/impl/error_code.ipp
+/include/asio/impl/error.ipp
+/include/asio/impl/io_service.hpp
 /include/asio/impl/io_service.ipp
-/include/asio/impl/read_at.ipp
-/include/asio/impl/read.ipp
-/include/asio/impl/read_until.ipp
+/include/asio/impl/read_at.hpp
+/include/asio/impl/read.hpp
+/include/asio/impl/read_until.hpp
+/include/asio/impl/serial_port_base.hpp
 /include/asio/impl/serial_port_base.ipp
-/include/asio/impl/write_at.ipp
-/include/asio/impl/write.ipp
+/include/asio/impl/src.cpp
+/include/asio/impl/write_at.hpp
+/include/asio/impl/write.hpp
 /include/asio/io_service.hpp
 /include/asio/ip/
 /include/asio/ip/address.hpp
@@ -2655,9 +2740,21 @@
 /include/asio/ip/basic_resolver_iterator.hpp
 /include/asio/ip/basic_resolver_query.hpp
 /include/asio/ip/detail/
+/include/asio/ip/detail/endpoint.hpp
+/include/asio/ip/detail/impl/
+/include/asio/ip/detail/impl/endpoint.ipp
 /include/asio/ip/detail/socket_option.hpp
 /include/asio/ip/host_name.hpp
 /include/asio/ip/icmp.hpp
+/include/asio/ip/impl/
+/include/asio/ip/impl/address.hpp
+/include/asio/ip/impl/address.ipp
+/include/asio/ip/impl/address_v4.hpp
+/include/asio/ip/impl/address_v4.ipp
+/include/asio/ip/impl/address_v6.hpp
+/include/asio/ip/impl/address_v6.ipp
+/include/asio/ip/impl/basic_endpoint.hpp
+/include/asio/ip/impl/host_name.ipp
 /include/asio/ip/multicast.hpp
 /include/asio/ip/resolver_query_base.hpp
 /include/asio/ip/resolver_service.hpp
@@ -2671,6 +2768,10 @@
 /include/asio/local/basic_endpoint.hpp
 /include/asio/local/connect_pair.hpp
 /include/asio/local/datagram_protocol.hpp
+/include/asio/local/detail/
+/include/asio/local/detail/endpoint.hpp
+/include/asio/local/detail/impl/
+/include/asio/local/detail/impl/endpoint.ipp
 /include/asio/local/stream_protocol.hpp
 /include/asio/placeholders.hpp
 /include/asio/posix/
@@ -2871,10 +2972,10 @@
 /src/examples/ssl/server.cpp
 /src/examples/ssl/server.pem
 /src/examples/timeouts/
-/src/examples/timeouts/accept_timeout.cpp
-/src/examples/timeouts/connect_timeout.cpp
-/src/examples/timeouts/datagram_receive_timeout.cpp
-/src/examples/timeouts/stream_receive_timeout.cpp
+/src/examples/timeouts/async_tcp_client.cpp
+/src/examples/timeouts/blocking_tcp_client.cpp
+/src/examples/timeouts/blocking_udp_client.cpp
+/src/examples/timeouts/server.cpp
 /src/examples/timers/
 /src/examples/timers/tick_count_timer.cpp
 /src/examples/timers/time_t_timer.cpp
@@ -2911,6 +3012,15 @@
 /src/Makefile.mgw
 /src/Makefile.msc
 /src/tests/
+/src/tests/latency/
+/src/tests/latency/coroutine.hpp
+/src/tests/latency/high_res_clock.hpp
+/src/tests/latency/tcp_client.cpp
+/src/tests/latency/tcp_server.cpp
+/src/tests/latency/udp_client.cpp
+/src/tests/latency/udp_server.cpp
+/src/tests/latency/unyield.hpp
+/src/tests/latency/yield.hpp
 /src/tests/performance/
 /src/tests/performance/client.cpp
 /src/tests/performance/handler_allocator.hpp

diff --git a/asio/boost_asio.manifest b/asio/boost_asio.manifest
index 9b175a3..7640f65 100644
--- a/asio/boost_asio.manifest
+++ b/asio/boost_asio.manifest

@@ -10,6 +10,7 @@
 /boost/asio/basic_socket.hpp
 /boost/asio/basic_socket_iostream.hpp
 /boost/asio/basic_socket_streambuf.hpp
+/boost/asio/basic_streambuf_fwd.hpp
 /boost/asio/basic_streambuf.hpp
 /boost/asio/basic_stream_socket.hpp
 /boost/asio/buffered_read_stream_fwd.hpp
@@ -25,6 +26,7 @@
 /boost/asio/deadline_timer.hpp
 /boost/asio/deadline_timer_service.hpp
 /boost/asio/detail/
+/boost/asio/detail/array_fwd.hpp
 /boost/asio/detail/base_from_completion_cond.hpp
 /boost/asio/detail/bind_handler.hpp
 /boost/asio/detail/buffered_stream_storage.hpp
@@ -32,9 +34,12 @@
 /boost/asio/detail/buffer_sequence_adapter.hpp
 /boost/asio/detail/call_stack.hpp
 /boost/asio/detail/completion_handler.hpp
+/boost/asio/detail/config.hpp
 /boost/asio/detail/consuming_buffers.hpp
 /boost/asio/detail/deadline_timer_service.hpp
 /boost/asio/detail/descriptor_ops.hpp
+/boost/asio/detail/descriptor_read_op.hpp
+/boost/asio/detail/descriptor_write_op.hpp
 /boost/asio/detail/dev_poll_reactor_fwd.hpp
 /boost/asio/detail/dev_poll_reactor.hpp
 /boost/asio/detail/epoll_reactor_fwd.hpp
@@ -43,11 +48,54 @@
 /boost/asio/detail/event.hpp
 /boost/asio/detail/fd_set_adapter.hpp
 /boost/asio/detail/fenced_block.hpp
-/boost/asio/detail/gcc_fenced_block.hpp
+/boost/asio/detail/gcc_arm_fenced_block.hpp
+/boost/asio/detail/gcc_hppa_fenced_block.hpp
+/boost/asio/detail/gcc_sync_fenced_block.hpp
 /boost/asio/detail/gcc_x86_fenced_block.hpp
 /boost/asio/detail/handler_alloc_helpers.hpp
 /boost/asio/detail/handler_invoke_helpers.hpp
 /boost/asio/detail/hash_map.hpp
+/boost/asio/detail/impl/
+/boost/asio/detail/impl/descriptor_ops.ipp
+/boost/asio/detail/impl/dev_poll_reactor.hpp
+/boost/asio/detail/impl/dev_poll_reactor.ipp
+/boost/asio/detail/impl/epoll_reactor.hpp
+/boost/asio/detail/impl/epoll_reactor.ipp
+/boost/asio/detail/impl/eventfd_select_interrupter.ipp
+/boost/asio/detail/impl/kqueue_reactor.hpp
+/boost/asio/detail/impl/kqueue_reactor.ipp
+/boost/asio/detail/impl/pipe_select_interrupter.ipp
+/boost/asio/detail/impl/posix_event.ipp
+/boost/asio/detail/impl/posix_mutex.ipp
+/boost/asio/detail/impl/posix_thread.ipp
+/boost/asio/detail/impl/posix_tss_ptr.ipp
+/boost/asio/detail/impl/reactive_descriptor_service.ipp
+/boost/asio/detail/impl/reactive_serial_port_service.ipp
+/boost/asio/detail/impl/reactive_socket_service_base.ipp
+/boost/asio/detail/impl/resolver_service_base.ipp
+/boost/asio/detail/impl/select_reactor.hpp
+/boost/asio/detail/impl/select_reactor.ipp
+/boost/asio/detail/impl/service_registry.hpp
+/boost/asio/detail/impl/service_registry.ipp
+/boost/asio/detail/impl/socket_ops.ipp
+/boost/asio/detail/impl/socket_select_interrupter.ipp
+/boost/asio/detail/impl/strand_service.hpp
+/boost/asio/detail/impl/strand_service.ipp
+/boost/asio/detail/impl/task_io_service.hpp
+/boost/asio/detail/impl/task_io_service.ipp
+/boost/asio/detail/impl/throw_error.ipp
+/boost/asio/detail/impl/timer_queue.ipp
+/boost/asio/detail/impl/timer_queue_set.ipp
+/boost/asio/detail/impl/win_event.ipp
+/boost/asio/detail/impl/win_iocp_handle_service.ipp
+/boost/asio/detail/impl/win_iocp_io_service.hpp
+/boost/asio/detail/impl/win_iocp_io_service.ipp
+/boost/asio/detail/impl/win_iocp_serial_port_service.ipp
+/boost/asio/detail/impl/win_iocp_socket_service_base.ipp
+/boost/asio/detail/impl/win_mutex.ipp
+/boost/asio/detail/impl/winsock_init.ipp
+/boost/asio/detail/impl/win_thread.ipp
+/boost/asio/detail/impl/win_tss_ptr.ipp
 /boost/asio/detail/io_control.hpp
 /boost/asio/detail/kqueue_reactor_fwd.hpp
 /boost/asio/detail/kqueue_reactor.hpp
@@ -55,13 +103,13 @@
 /boost/asio/detail/macos_fenced_block.hpp
 /boost/asio/detail/mutex.hpp
 /boost/asio/detail/noncopyable.hpp
-/boost/asio/detail/null_buffers_op.hpp
 /boost/asio/detail/null_event.hpp
 /boost/asio/detail/null_fenced_block.hpp
 /boost/asio/detail/null_mutex.hpp
 /boost/asio/detail/null_signal_blocker.hpp
 /boost/asio/detail/null_thread.hpp
 /boost/asio/detail/null_tss_ptr.hpp
+/boost/asio/detail/object_pool.hpp
 /boost/asio/detail/old_win_sdk_compat.hpp
 /boost/asio/detail/operation.hpp
 /boost/asio/detail/op_queue.hpp
@@ -75,21 +123,32 @@
 /boost/asio/detail/posix_tss_ptr.hpp
 /boost/asio/detail/push_options.hpp
 /boost/asio/detail/reactive_descriptor_service.hpp
+/boost/asio/detail/reactive_null_buffers_op.hpp
 /boost/asio/detail/reactive_serial_port_service.hpp
+/boost/asio/detail/reactive_socket_accept_op.hpp
+/boost/asio/detail/reactive_socket_connect_op.hpp
+/boost/asio/detail/reactive_socket_recvfrom_op.hpp
+/boost/asio/detail/reactive_socket_recv_op.hpp
+/boost/asio/detail/reactive_socket_send_op.hpp
+/boost/asio/detail/reactive_socket_sendto_op.hpp
+/boost/asio/detail/reactive_socket_service_base.hpp
 /boost/asio/detail/reactive_socket_service.hpp
 /boost/asio/detail/reactor_fwd.hpp
 /boost/asio/detail/reactor.hpp
 /boost/asio/detail/reactor_op.hpp
 /boost/asio/detail/reactor_op_queue.hpp
+/boost/asio/detail/regex_fwd.hpp
+/boost/asio/detail/resolve_endpoint_op.hpp
+/boost/asio/detail/resolve_op.hpp
+/boost/asio/detail/resolver_service_base.hpp
 /boost/asio/detail/resolver_service.hpp
 /boost/asio/detail/scoped_lock.hpp
 /boost/asio/detail/select_interrupter.hpp
 /boost/asio/detail/select_reactor_fwd.hpp
 /boost/asio/detail/select_reactor.hpp
-/boost/asio/detail/service_base.hpp
-/boost/asio/detail/service_id.hpp
 /boost/asio/detail/service_registry_fwd.hpp
 /boost/asio/detail/service_registry.hpp
+/boost/asio/detail/shared_ptr.hpp
 /boost/asio/detail/signal_blocker.hpp
 /boost/asio/detail/signal_init.hpp
 /boost/asio/detail/socket_holder.hpp
@@ -112,19 +171,29 @@
 /boost/asio/detail/timer_scheduler_fwd.hpp
 /boost/asio/detail/timer_scheduler.hpp
 /boost/asio/detail/tss_ptr.hpp
+/boost/asio/detail/wait_handler.hpp
+/boost/asio/detail/weak_ptr.hpp
 /boost/asio/detail/wince_thread.hpp
 /boost/asio/detail/win_event.hpp
 /boost/asio/detail/win_fd_set_adapter.hpp
 /boost/asio/detail/win_fenced_block.hpp
+/boost/asio/detail/win_iocp_handle_read_op.hpp
 /boost/asio/detail/win_iocp_handle_service.hpp
+/boost/asio/detail/win_iocp_handle_write_op.hpp
 /boost/asio/detail/win_iocp_io_service_fwd.hpp
 /boost/asio/detail/win_iocp_io_service.hpp
+/boost/asio/detail/win_iocp_null_buffers_op.hpp
 /boost/asio/detail/win_iocp_operation.hpp
+/boost/asio/detail/win_iocp_overlapped_op.hpp
 /boost/asio/detail/win_iocp_overlapped_ptr.hpp
 /boost/asio/detail/win_iocp_serial_port_service.hpp
+/boost/asio/detail/win_iocp_socket_accept_op.hpp
+/boost/asio/detail/win_iocp_socket_recvfrom_op.hpp
+/boost/asio/detail/win_iocp_socket_recv_op.hpp
+/boost/asio/detail/win_iocp_socket_send_op.hpp
+/boost/asio/detail/win_iocp_socket_service_base.hpp
 /boost/asio/detail/win_iocp_socket_service.hpp
 /boost/asio/detail/win_mutex.hpp
-/boost/asio/detail/win_signal_blocker.hpp
 /boost/asio/detail/winsock_init.hpp
 /boost/asio/detail/win_thread.hpp
 /boost/asio/detail/win_tss_ptr.hpp
@@ -134,13 +203,17 @@
 /boost/asio/handler_invoke_hook.hpp
 /boost/asio.hpp
 /boost/asio/impl/
+/boost/asio/impl/error.ipp
+/boost/asio/impl/io_service.hpp
 /boost/asio/impl/io_service.ipp
-/boost/asio/impl/read_at.ipp
-/boost/asio/impl/read.ipp
-/boost/asio/impl/read_until.ipp
+/boost/asio/impl/read_at.hpp
+/boost/asio/impl/read.hpp
+/boost/asio/impl/read_until.hpp
+/boost/asio/impl/serial_port_base.hpp
 /boost/asio/impl/serial_port_base.ipp
-/boost/asio/impl/write_at.ipp
-/boost/asio/impl/write.ipp
+/boost/asio/impl/src.cpp
+/boost/asio/impl/write_at.hpp
+/boost/asio/impl/write.hpp
 /boost/asio/io_service.hpp
 /boost/asio/ip/
 /boost/asio/ip/address.hpp
@@ -152,9 +225,21 @@
 /boost/asio/ip/basic_resolver_iterator.hpp
 /boost/asio/ip/basic_resolver_query.hpp
 /boost/asio/ip/detail/
+/boost/asio/ip/detail/endpoint.hpp
+/boost/asio/ip/detail/impl/
+/boost/asio/ip/detail/impl/endpoint.ipp
 /boost/asio/ip/detail/socket_option.hpp
 /boost/asio/ip/host_name.hpp
 /boost/asio/ip/icmp.hpp
+/boost/asio/ip/impl/
+/boost/asio/ip/impl/address.hpp
+/boost/asio/ip/impl/address.ipp
+/boost/asio/ip/impl/address_v4.hpp
+/boost/asio/ip/impl/address_v4.ipp
+/boost/asio/ip/impl/address_v6.hpp
+/boost/asio/ip/impl/address_v6.ipp
+/boost/asio/ip/impl/basic_endpoint.hpp
+/boost/asio/ip/impl/host_name.ipp
 /boost/asio/ip/multicast.hpp
 /boost/asio/ip/resolver_query_base.hpp
 /boost/asio/ip/resolver_service.hpp
@@ -168,6 +253,10 @@
 /boost/asio/local/basic_endpoint.hpp
 /boost/asio/local/connect_pair.hpp
 /boost/asio/local/datagram_protocol.hpp
+/boost/asio/local/detail/
+/boost/asio/local/detail/endpoint.hpp
+/boost/asio/local/detail/impl/
+/boost/asio/local/detail/impl/endpoint.ipp
 /boost/asio/local/stream_protocol.hpp
 /boost/asio/placeholders.hpp
 /boost/asio/posix/
@@ -220,6 +309,7 @@
 /boost/config/
 /boost/config/warning_disable.hpp
 /boost/system/
+/boost/system/api_config.hpp
 /boost/system/config.hpp
 /boost/system/cygwin_error.hpp
 /boost/system/error_code.hpp
@@ -368,10 +458,10 @@
 /doc/html/boost_asio/example/ssl/client.cpp
 /doc/html/boost_asio/example/ssl/server.cpp
 /doc/html/boost_asio/example/timeouts/
-/doc/html/boost_asio/example/timeouts/accept_timeout.cpp
-/doc/html/boost_asio/example/timeouts/connect_timeout.cpp
-/doc/html/boost_asio/example/timeouts/datagram_receive_timeout.cpp
-/doc/html/boost_asio/example/timeouts/stream_receive_timeout.cpp
+/doc/html/boost_asio/example/timeouts/async_tcp_client.cpp
+/doc/html/boost_asio/example/timeouts/blocking_tcp_client.cpp
+/doc/html/boost_asio/example/timeouts/blocking_udp_client.cpp
+/doc/html/boost_asio/example/timeouts/server.cpp
 /doc/html/boost_asio/example/timers/
 /doc/html/boost_asio/example/timers/tick_count_timer.cpp
 /doc/html/boost_asio/example/timers/time_t_timer.cpp
@@ -1448,8 +1538,11 @@
 /doc/html/boost_asio/reference/buffers_iterator/operator_minus_/overload1.html
 /doc/html/boost_asio/reference/buffers_iterator/operator_minus_/overload2.html
 /doc/html/boost_asio/reference/buffers_iterator/operator_not__eq_.html
+/doc/html/boost_asio/reference/buffers_iterator/operator_plus_/
 /doc/html/boost_asio/reference/buffers_iterator/operator_plus__eq_.html
 /doc/html/boost_asio/reference/buffers_iterator/operator_plus_.html
+/doc/html/boost_asio/reference/buffers_iterator/operator_plus_/overload1.html
+/doc/html/boost_asio/reference/buffers_iterator/operator_plus_/overload2.html
 /doc/html/boost_asio/reference/buffers_iterator/operator_plus__plus_/
 /doc/html/boost_asio/reference/buffers_iterator/operator_plus__plus_.html
 /doc/html/boost_asio/reference/buffers_iterator/operator_plus__plus_/overload1.html
@@ -1669,6 +1762,9 @@
 /doc/html/boost_asio/reference/ip__address/operator_eq_/overload1.html
 /doc/html/boost_asio/reference/ip__address/operator_eq_/overload2.html
 /doc/html/boost_asio/reference/ip__address/operator_eq_/overload3.html
+/doc/html/boost_asio/reference/ip__address/operator_gt__eq_.html
+/doc/html/boost_asio/reference/ip__address/operator_gt_.html
+/doc/html/boost_asio/reference/ip__address/operator_lt__eq_.html
 /doc/html/boost_asio/reference/ip__address/operator_lt_.html
 /doc/html/boost_asio/reference/ip__address/operator_lt__lt_.html
 /doc/html/boost_asio/reference/ip__address/operator_not__eq_.html
@@ -1786,6 +1882,9 @@
 /doc/html/boost_asio/reference/ip__basic_endpoint.html
 /doc/html/boost_asio/reference/ip__basic_endpoint/operator_eq__eq_.html
 /doc/html/boost_asio/reference/ip__basic_endpoint/operator_eq_.html
+/doc/html/boost_asio/reference/ip__basic_endpoint/operator_gt__eq_.html
+/doc/html/boost_asio/reference/ip__basic_endpoint/operator_gt_.html
+/doc/html/boost_asio/reference/ip__basic_endpoint/operator_lt__eq_.html
 /doc/html/boost_asio/reference/ip__basic_endpoint/operator_lt_.html
 /doc/html/boost_asio/reference/ip__basic_endpoint/operator_lt__lt_.html
 /doc/html/boost_asio/reference/ip__basic_endpoint/operator_not__eq_.html
@@ -1998,6 +2097,9 @@
 /doc/html/boost_asio/reference/local__basic_endpoint.html
 /doc/html/boost_asio/reference/local__basic_endpoint/operator_eq__eq_.html
 /doc/html/boost_asio/reference/local__basic_endpoint/operator_eq_.html
+/doc/html/boost_asio/reference/local__basic_endpoint/operator_gt__eq_.html
+/doc/html/boost_asio/reference/local__basic_endpoint/operator_gt_.html
+/doc/html/boost_asio/reference/local__basic_endpoint/operator_lt__eq_.html
 /doc/html/boost_asio/reference/local__basic_endpoint/operator_lt_.html
 /doc/html/boost_asio/reference/local__basic_endpoint/operator_lt__lt_.html
 /doc/html/boost_asio/reference/local__basic_endpoint/operator_not__eq_.html
@@ -3112,12 +3214,12 @@
 /libs/asio/example/ssl/server.cpp
 /libs/asio/example/ssl/server.pem
 /libs/asio/example/timeouts/
-/libs/asio/example/timeouts/accept_timeout.cpp
-/libs/asio/example/timeouts/connect_timeout.cpp
-/libs/asio/example/timeouts/datagram_receive_timeout.cpp
+/libs/asio/example/timeouts/async_tcp_client.cpp
+/libs/asio/example/timeouts/blocking_tcp_client.cpp
+/libs/asio/example/timeouts/blocking_udp_client.cpp
 /libs/asio/example/timeouts/Jamfile
 /libs/asio/example/timeouts/Jamfile.v2
-/libs/asio/example/timeouts/stream_receive_timeout.cpp
+/libs/asio/example/timeouts/server.cpp
 /libs/asio/example/timers/
 /libs/asio/example/timers/Jamfile
 /libs/asio/example/timers/Jamfile.v2
@@ -3253,7 +3355,9 @@
 /libs/system/index.html
 /libs/system/src/
 /libs/system/src/error_code.cpp
+/libs/system/src/local_free_on_destruction.hpp
 /libs/system/test/
+/libs/system/test/dynamic_link_test.cpp
 /libs/system/test/error_code_test.cpp
 /libs/system/test/error_code_user_test.cpp
 /libs/system/test/header_only_test.cpp
@@ -3265,4 +3369,5 @@
 /libs/system/test/system_msvc/error_code_test/
 /libs/system/test/system_msvc/error_code_test/error_code_test.vcproj
 /libs/system/test/system_msvc/system_msvc.sln
+/libs/system/test/throw_test.cpp
 /README.txt

diff --git a/asio/configure.ac b/asio/configure.ac
index 5bc2371..6351500 100644
--- a/asio/configure.ac
+++ b/asio/configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(asio, [1.4.5])
+AC_INIT(asio, [1.4.6])
 AC_CONFIG_SRCDIR(include/asio.hpp)
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE([tar-ustar])

diff --git a/asio/include/asio/version.hpp b/asio/include/asio/version.hpp
index 198f508..0102d5c 100644
--- a/asio/include/asio/version.hpp
+++ b/asio/include/asio/version.hpp

@@ -18,6 +18,6 @@
 // ASIO_VERSION % 100 is the sub-minor version
 // ASIO_VERSION / 100 % 1000 is the minor version
 // ASIO_VERSION / 100000 is the major version
-#define ASIO_VERSION 100405 // 1.4.5
+#define ASIO_VERSION 100406 // 1.4.6
 
 #endif // ASIO_VERSION_HPP