AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up header inclusion of old services.

Browse Source
This commit is contained in:
Christopher Kohlhoff 2016-09-04 14:39:46 +10:00
parent 26a0c87849
commit 7268a3f488
9 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
asio/include/asio/basic_datagram_socket.hpp
View File

@ -18,12 +18,15 @@
#include "asio/detail/config.hpp" #include "asio/detail/config.hpp"
#include <cstddef> #include <cstddef>
#include "asio/basic_socket.hpp" #include "asio/basic_socket.hpp"
#include "asio/datagram_socket_service.hpp"
#include "asio/detail/handler_type_requirements.hpp" #include "asio/detail/handler_type_requirements.hpp"
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/detail/type_traits.hpp" #include "asio/detail/type_traits.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/datagram_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"
namespace asio { namespace asio {

7
asio/include/asio/basic_deadline_timer.hpp
View File

@ -22,16 +22,17 @@
#include <cstddef> #include <cstddef>
#include "asio/basic_io_object.hpp" #include "asio/basic_io_object.hpp"
#include "asio/deadline_timer_service.hpp"
#include "asio/detail/handler_type_requirements.hpp" #include "asio/detail/handler_type_requirements.hpp"
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/time_traits.hpp" #include "asio/time_traits.hpp"
#if !defined(ASIO_ENABLE_OLD_SERVICES) #if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/deadline_timer_service.hpp"
#else // defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/detail/deadline_timer_service.hpp" # include "asio/detail/deadline_timer_service.hpp"
# define ASIO_SVC_T detail::deadline_timer_service<TimeTraits> # define ASIO_SVC_T detail::deadline_timer_service<TimeTraits>
#endif // !defined(ASIO_ENABLE_OLD_SERVICES) #endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"

5
asio/include/asio/basic_raw_socket.hpp
View File

@ -22,7 +22,10 @@
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/detail/type_traits.hpp" #include "asio/detail/type_traits.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/raw_socket_service.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/raw_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"

5
asio/include/asio/basic_seq_packet_socket.hpp
View File

@ -21,7 +21,10 @@
#include "asio/detail/handler_type_requirements.hpp" #include "asio/detail/handler_type_requirements.hpp"
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/seq_packet_socket_service.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/seq_packet_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"

7
asio/include/asio/basic_socket_acceptor.hpp
View File

@ -22,14 +22,15 @@
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/detail/type_traits.hpp" #include "asio/detail/type_traits.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/socket_acceptor_service.hpp"
#include "asio/socket_base.hpp" #include "asio/socket_base.hpp"
#if defined(ASIO_HAS_MOVE) #if defined(ASIO_HAS_MOVE)
# include <utility> # include <utility>
#endif // defined(ASIO_HAS_MOVE) #endif // defined(ASIO_HAS_MOVE)
#if !defined(ASIO_ENABLE_OLD_SERVICES) #if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/socket_acceptor_service.hpp"
#else // defined(ASIO_ENABLE_OLD_SERVICES)
# if defined(ASIO_WINDOWS_RUNTIME) # if defined(ASIO_WINDOWS_RUNTIME)
# include "asio/detail/null_socket_service.hpp" # include "asio/detail/null_socket_service.hpp"
# define ASIO_SVC_T detail::null_socket_service<Protocol> # define ASIO_SVC_T detail::null_socket_service<Protocol>
@ -40,7 +41,7 @@
# include "asio/detail/reactive_socket_service.hpp" # include "asio/detail/reactive_socket_service.hpp"
# define ASIO_SVC_T detail::reactive_socket_service<Protocol> # define ASIO_SVC_T detail::reactive_socket_service<Protocol>
# endif # endif
#endif // !defined(ASIO_ENABLE_OLD_SERVICES) #endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"

5
asio/include/asio/basic_socket_iostream.hpp
View File

@ -22,7 +22,10 @@
#include <istream> #include <istream>
#include <ostream> #include <ostream>
#include "asio/basic_socket_streambuf.hpp" #include "asio/basic_socket_streambuf.hpp"
#include "asio/stream_socket_service.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/stream_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#if !defined(ASIO_HAS_VARIADIC_TEMPLATES) #if !defined(ASIO_HAS_VARIADIC_TEMPLATES)

12
asio/include/asio/basic_socket_streambuf.hpp
View File

@ -22,13 +22,19 @@
#include <streambuf> #include <streambuf>
#include "asio/basic_socket.hpp" #include "asio/basic_socket.hpp"
#include "asio/detail/array.hpp" #include "asio/detail/array.hpp"
#include "asio/detail/deadline_timer_service.hpp"
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/io_context.hpp" #include "asio/io_context.hpp"
#include "asio/stream_socket_service.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/stream_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#if defined(ASIO_HAS_BOOST_DATE_TIME) #if defined(ASIO_HAS_BOOST_DATE_TIME)
# include "asio/deadline_timer_service.hpp" # if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/deadline_timer_service.hpp"
# else // defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/detail/deadline_timer_service.hpp"
# endif // defined(ASIO_ENABLE_OLD_SERVICES)
#else #else
# include "asio/steady_timer.hpp" # include "asio/steady_timer.hpp"
#endif #endif

5
asio/include/asio/basic_stream_socket.hpp
View File

@ -22,7 +22,10 @@
#include "asio/detail/handler_type_requirements.hpp" #include "asio/detail/handler_type_requirements.hpp"
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/stream_socket_service.hpp"
#if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/stream_socket_service.hpp"
#endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"

7
asio/include/asio/basic_waitable_timer.hpp
View File

@ -22,19 +22,20 @@
#include "asio/detail/throw_error.hpp" #include "asio/detail/throw_error.hpp"
#include "asio/error.hpp" #include "asio/error.hpp"
#include "asio/wait_traits.hpp" #include "asio/wait_traits.hpp"
#include "asio/waitable_timer_service.hpp"
#if defined(ASIO_HAS_MOVE) #if defined(ASIO_HAS_MOVE)
# include <utility> # include <utility>
#endif // defined(ASIO_HAS_MOVE) #endif // defined(ASIO_HAS_MOVE)
#if !defined(ASIO_ENABLE_OLD_SERVICES) #if defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/waitable_timer_service.hpp"
#else // defined(ASIO_ENABLE_OLD_SERVICES)
# include "asio/detail/chrono_time_traits.hpp" # include "asio/detail/chrono_time_traits.hpp"
# include "asio/detail/deadline_timer_service.hpp" # include "asio/detail/deadline_timer_service.hpp"
# define ASIO_SVC_T \ # define ASIO_SVC_T \
detail::deadline_timer_service< \ detail::deadline_timer_service< \
detail::chrono_time_traits<Clock, WaitTraits> > detail::chrono_time_traits<Clock, WaitTraits> >
#endif // !defined(ASIO_ENABLE_OLD_SERVICES) #endif // defined(ASIO_ENABLE_OLD_SERVICES)
#include "asio/detail/push_options.hpp" #include "asio/detail/push_options.hpp"