diff options
| author | Spencer Jackson <spencer.jackson@mongodb.com> | 2020-01-08 16:10:44 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2020-01-08 16:10:44 +0000 |
| commit | 1709f2c1ef957978ca3632ad88c87b7f23124d5e (patch) | |
| tree | ed76da86e811f3c4efe0c4f24651c2793b4a1788 | |
| parent | 13fb0232005848397d0d87be2b07da004beab2b6 (diff) | |
| download | mongo-1709f2c1ef957978ca3632ad88c87b7f23124d5e.tar.gz | |
SERVER-30269 Upgrade ASIO
(cherry picked from commit 1bef1a5c3a5ed09b2efc899cf2ddba93e1ec1079)
481 files changed, 1251 insertions, 1032 deletions
diff --git a/src/third_party/asio-master/asio/COPYING b/src/third_party/asio-master/asio/COPYING index 5a0dd10d837..cca54442012 100644 --- a/src/third_party/asio-master/asio/COPYING +++ b/src/third_party/asio-master/asio/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) 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) diff --git a/src/third_party/asio-master/asio/configure.ac b/src/third_party/asio-master/asio/configure.ac index e8dff8d107c..58c6bffb44a 100644 --- a/src/third_party/asio-master/asio/configure.ac +++ b/src/third_party/asio-master/asio/configure.ac @@ -17,140 +17,18 @@ AC_ARG_WITH(boost, if test "${withval}" = no; then STANDALONE="yes" else - CPPFLAGS="$CPPFLAGS -I${withval}" + CPPFLAGS="$CPPFLAGS -I${withval} -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING" LIBS="$LIBS -L${withval}/stage/lib" fi ], [ - BOOSTDIR="`pwd`/../boost_1_55_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - LIBS="$LIBS -L${BOOSTDIR}/stage/lib" - else - BOOSTDIR="`pwd`/../boost_1_54_0" + BOOSTDIR=`ls -1d ../boost_*_*_*/ 2>/dev/null | sort -t "_" -k 2nr -k 3nr -k 4nr | head -n 1 | sed -e 's/\/$//'` + if test "${BOOSTDIR}" != ""; then + BOOSTDIR="`pwd`/${BOOSTDIR}" if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" + echo "using automatically detected boost from ${BOOSTDIR}" + CPPFLAGS="$CPPFLAGS -I${BOOSTDIR} -DBOOST_CHRONO_DONT_PROVIDE_HYBRID_ERROR_HANDLING" LIBS="$LIBS -L${BOOSTDIR}/stage/lib" - else - BOOSTDIR="`pwd`/../boost_1_53_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_52_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_51_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_50_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_49_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_48_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_47_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_46_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_46_1" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_45_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_44_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_43_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_42_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_41_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_40_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_39_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_38_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_37_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_36_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_35_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_34_1" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_34_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_33_1" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - else - BOOSTDIR="`pwd`/../boost_1_33_0" - if test -d "${BOOSTDIR}"; then - CPPFLAGS="$CPPFLAGS -I${BOOSTDIR}" - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi - fi fi fi ]) @@ -179,7 +57,8 @@ fi AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl=DIR],[location of openssl]), [ - CPPFLAGS="$CPPFLAGS -I${withval}" + CPPFLAGS="$CPPFLAGS -I${withval}/include" + LIBS="$LIBS -L${withval}/lib" ],[]) AC_CHECK_HEADER([openssl/ssl.h],, @@ -198,6 +77,7 @@ case $host in *-*-linux*) CXXFLAGS="$CXXFLAGS -pthread" LDFLAGS="$LDFLAGS -pthread" + LIBS="$LIBS -lrt" ;; *-*-solaris*) if test "$GXX" = yes; then diff --git a/src/third_party/asio-master/asio/include/Makefile.am b/src/third_party/asio-master/asio/include/Makefile.am index 104267c4798..8832c40c4f0 100644 --- a/src/third_party/asio-master/asio/include/Makefile.am +++ b/src/third_party/asio-master/asio/include/Makefile.am @@ -322,8 +322,8 @@ nobase_include_HEADERS = \ asio/impl/spawn.hpp \ asio/impl/src.cpp \ asio/impl/src.hpp \ + asio/impl/system_context.ipp \ asio/impl/system_executor.hpp \ - asio/impl/system_executor.ipp \ asio/impl/thread_pool.hpp \ asio/impl/thread_pool.ipp \ asio/impl/use_future.hpp \ @@ -437,6 +437,7 @@ nobase_include_HEADERS = \ asio/strand.hpp \ asio/streambuf.hpp \ asio/stream_socket_service.hpp \ + asio/system_context.hpp \ asio/system_error.hpp \ asio/system_executor.hpp \ asio/system_timer.hpp \ diff --git a/src/third_party/asio-master/asio/include/asio.hpp b/src/third_party/asio-master/asio/include/asio.hpp index 1e42e035d25..f2da0efc783 100644 --- a/src/third_party/asio-master/asio/include/asio.hpp +++ b/src/third_party/asio-master/asio/include/asio.hpp @@ -2,7 +2,7 @@ // asio.hpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -120,6 +120,7 @@ #include "asio/strand.hpp" #include "asio/stream_socket_service.hpp" #include "asio/streambuf.hpp" +#include "asio/system_context.hpp" #include "asio/system_error.hpp" #include "asio/system_executor.hpp" #include "asio/thread.hpp" diff --git a/src/third_party/asio-master/asio/include/asio/associated_allocator.hpp b/src/third_party/asio-master/asio/include/asio/associated_allocator.hpp index 3834b862a5c..e2b70b590e7 100644 --- a/src/third_party/asio-master/asio/include/asio/associated_allocator.hpp +++ b/src/third_party/asio-master/asio/include/asio/associated_allocator.hpp @@ -2,7 +2,7 @@ // associated_allocator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -116,6 +116,14 @@ get_associated_allocator(const T& t, const Allocator& a) ASIO_NOEXCEPT return associated_allocator<T, Allocator>::get(t, a); } +#if defined(ASIO_HAS_ALIAS_TEMPLATES) + +template <typename T, typename Allocator = std::allocator<void> > +using associated_allocator_t + = typename associated_allocator<T, Allocator>::type; + +#endif // defined(ASIO_HAS_ALIAS_TEMPLATES) + } // namespace asio #include "asio/detail/pop_options.hpp" diff --git a/src/third_party/asio-master/asio/include/asio/associated_executor.hpp b/src/third_party/asio-master/asio/include/asio/associated_executor.hpp index 74603c593f0..6e3fef54609 100644 --- a/src/third_party/asio-master/asio/include/asio/associated_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/associated_executor.hpp @@ -2,7 +2,7 @@ // associated_executor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -135,6 +135,13 @@ get_associated_executor(const T& t, ExecutionContext& ctx, typename ExecutionContext::executor_type>::get(t, ctx.get_executor()); } +#if defined(ASIO_HAS_ALIAS_TEMPLATES) + +template <typename T, typename Executor = system_executor> +using associated_executor_t = typename associated_executor<T, Executor>::type; + +#endif // defined(ASIO_HAS_ALIAS_TEMPLATES) + } // namespace asio #include "asio/detail/pop_options.hpp" diff --git a/src/third_party/asio-master/asio/include/asio/async_result.hpp b/src/third_party/asio-master/asio/include/asio/async_result.hpp index cd866bbd0e6..f218de7e52d 100644 --- a/src/third_party/asio-master/asio/include/asio/async_result.hpp +++ b/src/third_party/asio-master/asio/include/asio/async_result.hpp @@ -2,7 +2,7 @@ // async_result.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_datagram_socket.hpp b/src/third_party/asio-master/asio/include/asio/basic_datagram_socket.hpp index a451013fba4..cd5ef2edee0 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_datagram_socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_datagram_socket.hpp @@ -2,7 +2,7 @@ // basic_datagram_socket.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_deadline_timer.hpp b/src/third_party/asio-master/asio/include/asio/basic_deadline_timer.hpp index 085c8ee1fe8..4e97cce7a1e 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_deadline_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_deadline_timer.hpp @@ -2,7 +2,7 @@ // basic_deadline_timer.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_io_object.hpp b/src/third_party/asio-master/asio/include/asio/basic_io_object.hpp index e1850d508a3..669427aa6d6 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_io_object.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_io_object.hpp @@ -2,7 +2,7 @@ // basic_io_object.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_raw_socket.hpp b/src/third_party/asio-master/asio/include/asio/basic_raw_socket.hpp index 30114939359..ee9bcbf6fbb 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_raw_socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_raw_socket.hpp @@ -2,7 +2,7 @@ // basic_raw_socket.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_seq_packet_socket.hpp b/src/third_party/asio-master/asio/include/asio/basic_seq_packet_socket.hpp index ca992eceeee..f6e8dc55268 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_seq_packet_socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_seq_packet_socket.hpp @@ -2,7 +2,7 @@ // basic_seq_packet_socket.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_serial_port.hpp b/src/third_party/asio-master/asio/include/asio/basic_serial_port.hpp index b6ac51ebb99..22ed8f79075 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_serial_port.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_serial_port.hpp @@ -2,7 +2,7 @@ // basic_serial_port.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/basic_signal_set.hpp b/src/third_party/asio-master/asio/include/asio/basic_signal_set.hpp index 6f1d07ed796..b7302ab7b5f 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_signal_set.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_signal_set.hpp @@ -2,7 +2,7 @@ // basic_signal_set.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_socket.hpp b/src/third_party/asio-master/asio/include/asio/basic_socket.hpp index 9d31ad7d1f2..43430161270 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_socket.hpp @@ -2,7 +2,7 @@ // basic_socket.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_socket_acceptor.hpp b/src/third_party/asio-master/asio/include/asio/basic_socket_acceptor.hpp index 8af2bdc9a70..dab58add6f7 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_socket_acceptor.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_socket_acceptor.hpp @@ -2,7 +2,7 @@ // basic_socket_acceptor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_socket_iostream.hpp b/src/third_party/asio-master/asio/include/asio/basic_socket_iostream.hpp index ad4759bec29..48acfeea530 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_socket_iostream.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_socket_iostream.hpp @@ -2,7 +2,7 @@ // basic_socket_iostream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -215,6 +215,8 @@ public: this->setf(std::ios_base::unitbuf); } +#if defined(ASIO_HAS_STD_IOSTREAM_MOVE) \ + || defined(GENERATING_DOCUMENTATION) /// Move-construct a basic_socket_iostream from another. basic_socket_iostream(basic_socket_iostream&& other) : detail::socket_iostream_base< @@ -236,6 +238,8 @@ public: WaitTraits ASIO_SVC_TARG1>::operator=(std::move(other)); return *this; } +#endif // defined(ASIO_HAS_STD_IOSTREAM_MOVE) + // || defined(GENERATING_DOCUMENTATION) #endif // defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION) #if defined(GENERATING_DOCUMENTATION) diff --git a/src/third_party/asio-master/asio/include/asio/basic_socket_streambuf.hpp b/src/third_party/asio-master/asio/include/asio/basic_socket_streambuf.hpp index 42fb3cacd75..81fa55e2276 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_socket_streambuf.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_socket_streambuf.hpp @@ -2,7 +2,7 @@ // basic_socket_streambuf.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_stream_socket.hpp b/src/third_party/asio-master/asio/include/asio/basic_stream_socket.hpp index 31e685098a5..95d9ccdd503 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_stream_socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_stream_socket.hpp @@ -2,7 +2,7 @@ // basic_stream_socket.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_streambuf.hpp b/src/third_party/asio-master/asio/include/asio/basic_streambuf.hpp index 0f060321788..6c839399570 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_streambuf.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_streambuf.hpp @@ -2,7 +2,7 @@ // basic_streambuf.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -232,8 +232,7 @@ public: */ void commit(std::size_t n) { - if (pptr() + n > epptr()) - n = epptr() - pptr(); + n = std::min<std::size_t>(n, epptr() - pptr()); pbump(static_cast<int>(n)); setg(eback(), gptr(), pptr()); } diff --git a/src/third_party/asio-master/asio/include/asio/basic_streambuf_fwd.hpp b/src/third_party/asio-master/asio/include/asio/basic_streambuf_fwd.hpp index 361997b779f..09a5b7591e5 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_streambuf_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_streambuf_fwd.hpp @@ -2,7 +2,7 @@ // basic_streambuf_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/basic_waitable_timer.hpp b/src/third_party/asio-master/asio/include/asio/basic_waitable_timer.hpp index 6e9a3e18585..976c173c1b0 100644 --- a/src/third_party/asio-master/asio/include/asio/basic_waitable_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/basic_waitable_timer.hpp @@ -2,7 +2,7 @@ // basic_waitable_timer.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/bind_executor.hpp b/src/third_party/asio-master/asio/include/asio/bind_executor.hpp index 3ed890d9d73..3971f057a25 100644 --- a/src/third_party/asio-master/asio/include/asio/bind_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/bind_executor.hpp @@ -2,7 +2,7 @@ // bind_executor.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffer.hpp b/src/third_party/asio-master/asio/include/asio/buffer.hpp index 7d53ddec089..14d5ca0e404 100644 --- a/src/third_party/asio-master/asio/include/asio/buffer.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffer.hpp @@ -2,7 +2,7 @@ // buffer.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_read_stream.hpp b/src/third_party/asio-master/asio/include/asio/buffered_read_stream.hpp index 908dd37101e..3196ce937b6 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_read_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_read_stream.hpp @@ -2,7 +2,7 @@ // buffered_read_stream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_read_stream_fwd.hpp b/src/third_party/asio-master/asio/include/asio/buffered_read_stream_fwd.hpp index 3f1646afc03..379450c798b 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_read_stream_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_read_stream_fwd.hpp @@ -2,7 +2,7 @@ // buffered_read_stream_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_stream.hpp b/src/third_party/asio-master/asio/include/asio/buffered_stream.hpp index cabab60726f..425a5087bf6 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_stream.hpp @@ -2,7 +2,7 @@ // buffered_stream.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_stream_fwd.hpp b/src/third_party/asio-master/asio/include/asio/buffered_stream_fwd.hpp index cc445d225cf..fbf1824e98a 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_stream_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_stream_fwd.hpp @@ -2,7 +2,7 @@ // buffered_stream_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_write_stream.hpp b/src/third_party/asio-master/asio/include/asio/buffered_write_stream.hpp index 9cdab8b1d25..7e67a08f02f 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_write_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_write_stream.hpp @@ -2,7 +2,7 @@ // buffered_write_stream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffered_write_stream_fwd.hpp b/src/third_party/asio-master/asio/include/asio/buffered_write_stream_fwd.hpp index 88f93a4126e..c55d2e2a230 100644 --- a/src/third_party/asio-master/asio/include/asio/buffered_write_stream_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffered_write_stream_fwd.hpp @@ -2,7 +2,7 @@ // buffered_write_stream_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/buffers_iterator.hpp b/src/third_party/asio-master/asio/include/asio/buffers_iterator.hpp index 9080915134a..cd2f1a1c17e 100644 --- a/src/third_party/asio-master/asio/include/asio/buffers_iterator.hpp +++ b/src/third_party/asio-master/asio/include/asio/buffers_iterator.hpp @@ -2,7 +2,7 @@ // buffers_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/completion_condition.hpp b/src/third_party/asio-master/asio/include/asio/completion_condition.hpp index cb22ddddd90..949c5f6d094 100644 --- a/src/third_party/asio-master/asio/include/asio/completion_condition.hpp +++ b/src/third_party/asio-master/asio/include/asio/completion_condition.hpp @@ -2,7 +2,7 @@ // completion_condition.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/connect.hpp b/src/third_party/asio-master/asio/include/asio/connect.hpp index 7dba932ecfb..a80db1cd884 100644 --- a/src/third_party/asio-master/asio/include/asio/connect.hpp +++ b/src/third_party/asio-master/asio/include/asio/connect.hpp @@ -2,7 +2,7 @@ // connect.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/coroutine.hpp b/src/third_party/asio-master/asio/include/asio/coroutine.hpp index d4a03356d69..13e296563f4 100644 --- a/src/third_party/asio-master/asio/include/asio/coroutine.hpp +++ b/src/third_party/asio-master/asio/include/asio/coroutine.hpp @@ -2,7 +2,7 @@ // coroutine.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/datagram_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/datagram_socket_service.hpp index 5388742c2ca..5253fd14025 100644 --- a/src/third_party/asio-master/asio/include/asio/datagram_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/datagram_socket_service.hpp @@ -2,7 +2,7 @@ // datagram_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/deadline_timer.hpp b/src/third_party/asio-master/asio/include/asio/deadline_timer.hpp index 1ffbfe534d0..996d1b1275c 100644 --- a/src/third_party/asio-master/asio/include/asio/deadline_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/deadline_timer.hpp @@ -2,7 +2,7 @@ // deadline_timer.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/deadline_timer_service.hpp b/src/third_party/asio-master/asio/include/asio/deadline_timer_service.hpp index 7acac1cb109..ba232e19de1 100644 --- a/src/third_party/asio-master/asio/include/asio/deadline_timer_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/deadline_timer_service.hpp @@ -2,7 +2,7 @@ // deadline_timer_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/defer.hpp b/src/third_party/asio-master/asio/include/asio/defer.hpp index 5e8061406ab..5e2f24dc5e4 100644 --- a/src/third_party/asio-master/asio/include/asio/defer.hpp +++ b/src/third_party/asio-master/asio/include/asio/defer.hpp @@ -2,7 +2,7 @@ // defer.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/array.hpp b/src/third_party/asio-master/asio/include/asio/detail/array.hpp index cfb0acce60a..1890541c116 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/array.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/array.hpp @@ -2,7 +2,7 @@ // detail/array.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/array_fwd.hpp b/src/third_party/asio-master/asio/include/asio/detail/array_fwd.hpp index 6a19a820461..c871872095a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/array_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/array_fwd.hpp @@ -2,7 +2,7 @@ // detail/array_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/assert.hpp b/src/third_party/asio-master/asio/include/asio/detail/assert.hpp index 22bb4b94fd9..45860f04db5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/assert.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/assert.hpp @@ -2,7 +2,7 @@ // detail/assert.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/atomic_count.hpp b/src/third_party/asio-master/asio/include/asio/detail/atomic_count.hpp index 798f9150097..581afa9c62b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/atomic_count.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/atomic_count.hpp @@ -2,7 +2,7 @@ // detail/atomic_count.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/base_from_completion_cond.hpp b/src/third_party/asio-master/asio/include/asio/detail/base_from_completion_cond.hpp index 9f5165b230d..a6b0bf5bc6a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/base_from_completion_cond.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/base_from_completion_cond.hpp @@ -2,7 +2,7 @@ // detail/base_from_completion_cond.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/bind_handler.hpp b/src/third_party/asio-master/asio/include/asio/detail/bind_handler.hpp index 3752464a544..55c46a0707c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/bind_handler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/bind_handler.hpp @@ -2,7 +2,7 @@ // detail/bind_handler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/buffer_resize_guard.hpp b/src/third_party/asio-master/asio/include/asio/detail/buffer_resize_guard.hpp index 2768c8a107c..0eee4113217 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/buffer_resize_guard.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/buffer_resize_guard.hpp @@ -2,7 +2,7 @@ // detail/buffer_resize_guard.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/buffer_sequence_adapter.hpp b/src/third_party/asio-master/asio/include/asio/detail/buffer_sequence_adapter.hpp index f81e312a47c..450b3eecdd7 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/buffer_sequence_adapter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/buffer_sequence_adapter.hpp @@ -2,7 +2,7 @@ // detail/buffer_sequence_adapter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/buffered_stream_storage.hpp b/src/third_party/asio-master/asio/include/asio/detail/buffered_stream_storage.hpp index a71120dca41..14697115faa 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/buffered_stream_storage.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/buffered_stream_storage.hpp @@ -2,7 +2,7 @@ // detail/buffered_stream_storage.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/call_stack.hpp b/src/third_party/asio-master/asio/include/asio/detail/call_stack.hpp index 9835e64aa18..414b6211e98 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/call_stack.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/call_stack.hpp @@ -2,7 +2,7 @@ // detail/call_stack.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/chrono.hpp b/src/third_party/asio-master/asio/include/asio/detail/chrono.hpp index 31d6c6e7dfd..733e550d500 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/chrono.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/chrono.hpp @@ -2,7 +2,7 @@ // detail/chrono.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/chrono_time_traits.hpp b/src/third_party/asio-master/asio/include/asio/detail/chrono_time_traits.hpp index b6236a5001f..553bfa4641c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/chrono_time_traits.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/chrono_time_traits.hpp @@ -2,7 +2,7 @@ // detail/chrono_time_traits.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/completion_handler.hpp b/src/third_party/asio-master/asio/include/asio/detail/completion_handler.hpp index e510dedfbcb..46b38eb24d5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/completion_handler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/completion_handler.hpp @@ -2,7 +2,7 @@ // detail/completion_handler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/concurrency_hint.hpp b/src/third_party/asio-master/asio/include/asio/detail/concurrency_hint.hpp index 8a378c593a6..b4dbb74befd 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/concurrency_hint.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/concurrency_hint.hpp @@ -2,7 +2,7 @@ // detail/concurrency_hint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_event.hpp b/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_event.hpp index 7ce806a2358..f2a18d3de69 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_event.hpp @@ -2,7 +2,7 @@ // detail/conditionally_enabled_event.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_mutex.hpp index 39c168764b3..df5a78f490d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/conditionally_enabled_mutex.hpp @@ -2,7 +2,7 @@ // detail/conditionally_enabled_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/config.hpp b/src/third_party/asio-master/asio/include/asio/detail/config.hpp index 115c4500b63..7fe6a95a1b0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp @@ -2,7 +2,7 @@ // detail/config.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -170,6 +170,11 @@ # endif // defined(__GXX_EXPERIMENTAL_CXX0X__) # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 4) # endif // defined(__GNUC__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1900) +# define ASIO_HAS_VARIADIC_TEMPLATES 1 +# endif // (_MSC_VER >= 1900) +# endif // defined(ASIO_MSVC) # endif // !defined(ASIO_DISABLE_VARIADIC_TEMPLATES) #endif // !defined(ASIO_HAS_VARIADIC_TEMPLATES) @@ -187,6 +192,11 @@ # define ASIO_DELETED = delete # endif // __has_feature(__cxx_deleted_functions__) # endif // defined(__clang__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1900) +# define ASIO_DELETED = delete +# endif // (_MSC_VER >= 1900) +# endif // defined(ASIO_MSVC) # if !defined(ASIO_DELETED) # define ASIO_DELETED # endif // !defined(ASIO_DELETED) @@ -207,6 +217,11 @@ # endif // defined(__GXX_EXPERIMENTAL_CXX0X__) # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) || (__GNUC__ > 4) # endif // defined(__GNUC__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1900) +# define ASIO_HAS_CONSTEXPR 1 +# endif // (_MSC_VER >= 1900) +# endif // defined(ASIO_MSVC) # endif // !defined(ASIO_DISABLE_CONSTEXPR) #endif // !defined(ASIO_HAS_CONSTEXPR) #if !defined(ASIO_CONSTEXPR) @@ -273,6 +288,29 @@ # endif // !defined(ASIO_DISABLE_DECLTYPE) #endif // !defined(ASIO_HAS_DECLTYPE) +// Support alias templates on compilers known to allow it. +#if !defined(ASIO_HAS_ALIAS_TEMPLATES) +# if !defined(ASIO_DISABLE_ALIAS_TEMPLATES) +# if defined(__clang__) +# if __has_feature(__cxx_alias_templates__) +# define ASIO_HAS_ALIAS_TEMPLATES 1 +# endif // __has_feature(__cxx_alias_templates__) +# endif // defined(__clang__) +# if defined(__GNUC__) +# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) +# if defined(__GXX_EXPERIMENTAL_CXX0X__) +# define ASIO_HAS_ALIAS_TEMPLATES 1 +# endif // defined(__GXX_EXPERIMENTAL_CXX0X__) +# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) +# endif // defined(__GNUC__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1900) +# define ASIO_HAS_ALIAS_TEMPLATES 1 +# endif // (_MSC_VER >= 1900) +# endif // defined(ASIO_MSVC) +# endif // !defined(ASIO_DISABLE_ALIAS_TEMPLATES) +#endif // !defined(ASIO_HAS_ALIAS_TEMPLATES) + // Standard library support for system errors. #if !defined(ASIO_HAS_STD_SYSTEM_ERROR) # if !defined(ASIO_DISABLE_STD_SYSTEM_ERROR) @@ -414,11 +452,11 @@ # endif // (__cplusplus >= 201103) # endif // defined(__clang__) # if defined(__GNUC__) -# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4) +# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) # if defined(__GXX_EXPERIMENTAL_CXX0X__) # define ASIO_HAS_STD_ATOMIC 1 # endif // defined(__GXX_EXPERIMENTAL_CXX0X__) -# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4) +# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) # endif // defined(__GNUC__) # if defined(ASIO_MSVC) # if (_MSC_VER >= 1700) @@ -745,24 +783,47 @@ #if !defined(ASIO_HAS_STD_STRING_VIEW) # if !defined(ASIO_DISABLE_STD_STRING_VIEW) # if defined(__clang__) -# if (__cplusplus >= 201103) +# if (__cplusplus >= 201402) # if __has_include(<experimental/string_view>) # define ASIO_HAS_STD_STRING_VIEW 1 # define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 # endif // __has_include(<experimental/string_view>) -# endif // (__cplusplus >= 201103) +# endif // (__cplusplus >= 201402) # endif // defined(__clang__) # if defined(__GNUC__) # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) -# if (__cplusplus >= 201300) +# if (__cplusplus >= 201402) # define ASIO_HAS_STD_STRING_VIEW 1 # define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 -# endif // (__cplusplus >= 201300) +# endif // (__cplusplus >= 201402) # endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4) # endif // defined(__GNUC__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1910 && _HAS_CXX17) +# define ASIO_HAS_STD_STRING_VIEW +# endif // (_MSC_VER >= 1910) +# endif // defined(ASIO_MSVC) # endif // !defined(ASIO_DISABLE_STD_STRING_VIEW) #endif // !defined(ASIO_HAS_STD_STRING_VIEW) +// Standard library support for iostream move construction and assignment. +#if !defined(ASIO_HAS_STD_IOSTREAM_MOVE) +# if !defined(ASIO_DISABLE_STD_IOSTREAM_MOVE) +# if defined(__GNUC__) +# if (__GNUC__ > 4) +# if defined(__GXX_EXPERIMENTAL_CXX0X__) +# define ASIO_HAS_STD_IOSTREAM_MOVE 1 +# endif // defined(__GXX_EXPERIMENTAL_CXX0X__) +# endif // (__GNUC__ > 4) +# endif // defined(__GNUC__) +# if defined(ASIO_MSVC) +# if (_MSC_VER >= 1700) +# define ASIO_HAS_STD_IOSTREAM_MOVE 1 +# endif // (_MSC_VER >= 1700) +# endif // defined(ASIO_MSVC) +# endif // !defined(ASIO_DISABLE_STD_IOSTREAM_MOVE) +#endif // !defined(ASIO_HAS_STD_IOSTREAM_MOVE) + // Windows App target. Windows but with a limited API. #if !defined(ASIO_WINDOWS_APP) # if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0603) diff --git a/src/third_party/asio-master/asio/include/asio/detail/consuming_buffers.hpp b/src/third_party/asio-master/asio/include/asio/detail/consuming_buffers.hpp index b1d656770fd..8ae6b45f974 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/consuming_buffers.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/consuming_buffers.hpp @@ -2,7 +2,7 @@ // detail/consuming_buffers.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -56,11 +56,12 @@ public: // Construct to represent the entire list of buffers. explicit consuming_buffers(const Buffers& buffers) : buffers_(buffers), - total_size_(asio::buffer_size(buffers)), total_consumed_(0), next_elem_(0), next_elem_offset_(0) { + using asio::buffer_size; + total_size_ = buffer_size(buffers); } // Determine if we are at the end of the buffers. diff --git a/src/third_party/asio-master/asio/include/asio/detail/cstddef.hpp b/src/third_party/asio-master/asio/include/asio/detail/cstddef.hpp index a5092ce53b0..15cc2f8f9fd 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/cstddef.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/cstddef.hpp @@ -2,7 +2,7 @@ // detail/cstddef.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/cstdint.hpp b/src/third_party/asio-master/asio/include/asio/detail/cstdint.hpp index 2c0641421c3..7d5bb0f98ad 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/cstdint.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/cstdint.hpp @@ -2,7 +2,7 @@ // detail/cstdint.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/date_time_fwd.hpp b/src/third_party/asio-master/asio/include/asio/detail/date_time_fwd.hpp index 918bb7bdbc6..ce10b4bf5a0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/date_time_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/date_time_fwd.hpp @@ -2,7 +2,7 @@ // detail/date_time_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/deadline_timer_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/deadline_timer_service.hpp index 816f16f1e5b..de22cead856 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/deadline_timer_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/deadline_timer_service.hpp @@ -2,7 +2,7 @@ // detail/deadline_timer_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/dependent_type.hpp b/src/third_party/asio-master/asio/include/asio/detail/dependent_type.hpp index a4737e2e7b6..5d829235235 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/dependent_type.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/dependent_type.hpp @@ -2,7 +2,7 @@ // detail/dependent_type.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/descriptor_ops.hpp b/src/third_party/asio-master/asio/include/asio/detail/descriptor_ops.hpp index 677f010ca50..2f5b0b55276 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/descriptor_ops.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/descriptor_ops.hpp @@ -2,7 +2,7 @@ // detail/descriptor_ops.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/descriptor_read_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/descriptor_read_op.hpp index f1027b004eb..ce7e44e526e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/descriptor_read_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/descriptor_read_op.hpp @@ -2,7 +2,7 @@ // detail/descriptor_read_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/descriptor_write_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/descriptor_write_op.hpp index 96d6e5bc8da..38152517238 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/descriptor_write_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/descriptor_write_op.hpp @@ -2,7 +2,7 @@ // detail/descriptor_write_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/dev_poll_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/dev_poll_reactor.hpp index 2ea8dd46053..0a9a780e2e2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/dev_poll_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/dev_poll_reactor.hpp @@ -2,7 +2,7 @@ // detail/dev_poll_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -101,15 +101,21 @@ public: ASIO_DECL void cancel_ops(socket_type descriptor, per_descriptor_data&); // Cancel any operations that are running against the descriptor and remove - // its registration from the reactor. + // its registration from the reactor. The reactor resources associated with + // the descriptor must be released by calling cleanup_descriptor_data. ASIO_DECL void deregister_descriptor(socket_type descriptor, per_descriptor_data&, bool closing); - // Cancel any operations that are running against the descriptor and remove - // its registration from the reactor. + // Remove the descriptor's registration from the reactor. The reactor + // resources associated with the descriptor must be released by calling + // cleanup_descriptor_data. ASIO_DECL void deregister_internal_descriptor( socket_type descriptor, per_descriptor_data&); + // Perform any post-deregistration cleanup tasks associated with the + // descriptor data. + ASIO_DECL void cleanup_descriptor_data(per_descriptor_data&); + // Add a new timer queue to the reactor. template <typename Time_Traits> void add_timer_queue(timer_queue<Time_Traits>& queue); diff --git a/src/third_party/asio-master/asio/include/asio/detail/epoll_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/epoll_reactor.hpp index ba8b2a15420..be18564c30a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/epoll_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/epoll_reactor.hpp @@ -2,7 +2,7 @@ // detail/epoll_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -67,6 +67,7 @@ public: ASIO_DECL descriptor_state(bool locking); void set_ready_events(uint32_t events) { task_result_ = events; } + void add_ready_events(uint32_t events) { task_result_ |= events; } ASIO_DECL operation* perform_io(uint32_t events); ASIO_DECL static void do_complete( void* owner, operation* base, @@ -127,14 +128,22 @@ public: per_descriptor_data& descriptor_data); // Cancel any operations that are running against the descriptor and remove - // its registration from the reactor. + // its registration from the reactor. The reactor resources associated with + // the descriptor must be released by calling cleanup_descriptor_data. ASIO_DECL void deregister_descriptor(socket_type descriptor, per_descriptor_data& descriptor_data, bool closing); - // Remote the descriptor's registration from the reactor. + // Remove the descriptor's registration from the reactor. The reactor + // resources associated with the descriptor must be released by calling + // cleanup_descriptor_data. ASIO_DECL void deregister_internal_descriptor( socket_type descriptor, per_descriptor_data& descriptor_data); + // Perform any post-deregistration cleanup tasks associated with the + // descriptor data. + ASIO_DECL void cleanup_descriptor_data( + per_descriptor_data& descriptor_data); + // Add a new timer queue to the reactor. template <typename Time_Traits> void add_timer_queue(timer_queue<Time_Traits>& timer_queue); diff --git a/src/third_party/asio-master/asio/include/asio/detail/event.hpp b/src/third_party/asio-master/asio/include/asio/detail/event.hpp index bb07fcdd18c..92901e7e5fc 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/event.hpp @@ -2,7 +2,7 @@ // detail/event.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/eventfd_select_interrupter.hpp b/src/third_party/asio-master/asio/include/asio/detail/eventfd_select_interrupter.hpp index fcc86637ad6..d6e45f0a64b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/eventfd_select_interrupter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/eventfd_select_interrupter.hpp @@ -2,7 +2,7 @@ // detail/eventfd_select_interrupter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/executor_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/executor_op.hpp index 31451306a5b..d9cd8ad8a50 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/executor_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/executor_op.hpp @@ -2,7 +2,7 @@ // detail/executor_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -31,11 +31,12 @@ template <typename Handler, typename Alloc, class executor_op : public Operation { public: - ASIO_DEFINE_HANDLER_ALLOCATOR_PTR(executor_op, Alloc); + ASIO_DEFINE_HANDLER_ALLOCATOR_PTR(executor_op); - executor_op(Handler& h, const Alloc& allocator) + template <typename H> + executor_op(ASIO_MOVE_ARG(H) h, const Alloc& allocator) : Operation(&executor_op::do_complete), - handler_(ASIO_MOVE_CAST(Handler)(h)), + handler_(ASIO_MOVE_CAST(H)(h)), allocator_(allocator) { } @@ -46,7 +47,8 @@ public: { // Take ownership of the handler object. executor_op* o(static_cast<executor_op*>(base)); - ptr p = { o->allocator_, o, o }; + Alloc allocator(o->allocator_); + ptr p = { detail::addressof(allocator), o, o }; ASIO_HANDLER_COMPLETION((*o)); diff --git a/src/third_party/asio-master/asio/include/asio/detail/fd_set_adapter.hpp b/src/third_party/asio-master/asio/include/asio/detail/fd_set_adapter.hpp index 44c4c46ddf5..cc842b2c22a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/fd_set_adapter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/fd_set_adapter.hpp @@ -2,7 +2,7 @@ // detail/fd_set_adapter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/fenced_block.hpp index 6ad7dffe413..6db72c23ba3 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/fenced_block.hpp @@ -2,7 +2,7 @@ // detail/fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/functional.hpp b/src/third_party/asio-master/asio/include/asio/detail/functional.hpp index a72a5fc69fa..540103db9a8 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/functional.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/functional.hpp @@ -2,7 +2,7 @@ // detail/functional.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/gcc_arm_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/gcc_arm_fenced_block.hpp index debdd3c9f1a..a134aaa43ee 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/gcc_arm_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/gcc_arm_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/gcc_arm_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/gcc_hppa_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/gcc_hppa_fenced_block.hpp index cd41eb28655..a850ac19200 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/gcc_hppa_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/gcc_hppa_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/gcc_hppa_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/gcc_sync_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/gcc_sync_fenced_block.hpp index 19330990bee..d947096b110 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/gcc_sync_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/gcc_sync_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/gcc_sync_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/gcc_x86_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/gcc_x86_fenced_block.hpp index 0ec66c54ab6..8f4c5278424 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/gcc_x86_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/gcc_x86_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/gcc_x86_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/global.hpp b/src/third_party/asio-master/asio/include/asio/detail/global.hpp index 87c57a008e9..b937887c855 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/global.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/global.hpp @@ -2,7 +2,7 @@ // detail/global.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_alloc_helpers.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_alloc_helpers.hpp index 861f5d45c7b..3b72e33345a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_alloc_helpers.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_alloc_helpers.hpp @@ -2,7 +2,7 @@ // detail/handler_alloc_helpers.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -18,6 +18,7 @@ #include "asio/detail/config.hpp" #include "asio/detail/memory.hpp" #include "asio/detail/noncopyable.hpp" +#include "asio/detail/recycling_allocator.hpp" #include "asio/associated_allocator.hpp" #include "asio/handler_alloc_hook.hpp" @@ -120,17 +121,34 @@ public: Handler& handler_; }; +template <typename Handler, typename Allocator> +struct get_hook_allocator +{ + typedef Allocator type; + + static type get(Handler&, const Allocator& a) + { + return a; + } +}; + +template <typename Handler, typename T> +struct get_hook_allocator<Handler, std::allocator<T> > +{ + typedef hook_allocator<Handler, T> type; + + static type get(Handler& handler, const std::allocator<T>&) + { + return type(handler); + } +}; + } // namespace detail } // namespace asio #define ASIO_DEFINE_HANDLER_PTR(op) \ struct ptr \ { \ - typedef typename ::asio::associated_allocator<Handler, \ - ::asio::detail::hook_allocator<Handler, \ - void> >::type associated_allocator_type; \ - typedef ASIO_REBIND_ALLOC( \ - associated_allocator_type, op) allocator_type; \ Handler* h; \ op* v; \ op* p; \ @@ -140,16 +158,26 @@ public: } \ static op* allocate(Handler& handler) \ { \ - allocator_type a(::asio::associated_allocator<Handler, \ - ::asio::detail::hook_allocator<Handler, void> >::get(handler, \ - ::asio::detail::hook_allocator<Handler, void>(handler))); \ + typedef typename ::asio::associated_allocator< \ + Handler>::type associated_allocator_type; \ + typedef typename ::asio::detail::get_hook_allocator< \ + Handler, associated_allocator_type>::type hook_allocator_type; \ + ASIO_REBIND_ALLOC(hook_allocator_type, op) a( \ + ::asio::detail::get_hook_allocator< \ + Handler, associated_allocator_type>::get( \ + handler, ::asio::get_associated_allocator(handler))); \ return a.allocate(1); \ } \ void reset() \ { \ - allocator_type a(::asio::associated_allocator<Handler, \ - ::asio::detail::hook_allocator<Handler, void> >::get(*h, \ - ::asio::detail::hook_allocator<Handler, void>(*h))); \ + typedef typename ::asio::associated_allocator< \ + Handler>::type associated_allocator_type; \ + typedef typename ::asio::detail::get_hook_allocator< \ + Handler, associated_allocator_type>::type hook_allocator_type; \ + ASIO_REBIND_ALLOC(hook_allocator_type, op) a( \ + ::asio::detail::get_hook_allocator< \ + Handler, associated_allocator_type>::get( \ + *h, ::asio::get_associated_allocator(*h))); \ if (p) \ { \ p->~op(); \ @@ -164,18 +192,30 @@ public: } \ /**/ -#define ASIO_DEFINE_HANDLER_ALLOCATOR_PTR(op, alloc) \ +#define ASIO_DEFINE_HANDLER_ALLOCATOR_PTR(op) \ struct ptr \ { \ - ASIO_REBIND_ALLOC(alloc, op) a; \ + const Alloc* a; \ void* v; \ op* p; \ ~ptr() \ { \ reset(); \ } \ + static op* allocate(const Alloc& a) \ + { \ + typedef typename ::asio::detail::get_recycling_allocator< \ + Alloc>::type recycling_allocator_type; \ + ASIO_REBIND_ALLOC(recycling_allocator_type, op) a1( \ + ::asio::detail::get_recycling_allocator<Alloc>::get(a)); \ + return a1.allocate(1); \ + } \ void reset() \ { \ + typedef typename ::asio::detail::get_recycling_allocator< \ + Alloc>::type recycling_allocator_type; \ + ASIO_REBIND_ALLOC(recycling_allocator_type, op) a1( \ + ::asio::detail::get_recycling_allocator<Alloc>::get(*a)); \ if (p) \ { \ p->~op(); \ @@ -183,7 +223,7 @@ public: } \ if (v) \ { \ - a.deallocate(static_cast<op*>(v), 1); \ + a1.deallocate(static_cast<op*>(v), 1); \ v = 0; \ } \ } \ diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_cont_helpers.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_cont_helpers.hpp index defdf26525d..c57810bd808 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_cont_helpers.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_cont_helpers.hpp @@ -2,7 +2,7 @@ // detail/handler_cont_helpers.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_invoke_helpers.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_invoke_helpers.hpp index 91325ee9e98..4b160c39143 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_invoke_helpers.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_invoke_helpers.hpp @@ -2,7 +2,7 @@ // detail/handler_invoke_helpers.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_tracking.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_tracking.hpp index 6ea19a3f10c..187db67deb3 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_tracking.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_tracking.hpp @@ -2,7 +2,7 @@ // detail/handler_tracking.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_type_requirements.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_type_requirements.hpp index 9fb1318a9c4..c06468b8f5a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_type_requirements.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_type_requirements.hpp @@ -2,7 +2,7 @@ // detail/handler_type_requirements.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/handler_work.hpp b/src/third_party/asio-master/asio/include/asio/detail/handler_work.hpp index 327c552434b..16a5d3af3ba 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/handler_work.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/handler_work.hpp @@ -2,7 +2,7 @@ // detail/handler_work.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/hash_map.hpp b/src/third_party/asio-master/asio/include/asio/detail/hash_map.hpp index 8c52edcd3f1..3702194c99f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/hash_map.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/hash_map.hpp @@ -2,7 +2,7 @@ // detail/hash_map.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/buffer_sequence_adapter.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/buffer_sequence_adapter.ipp index 9bf955f917c..a5bc28db37a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/buffer_sequence_adapter.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/buffer_sequence_adapter.ipp @@ -2,7 +2,7 @@ // detail/impl/buffer_sequence_adapter.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/descriptor_ops.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/descriptor_ops.ipp index 07355e83eae..a76477b5f3a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/descriptor_ops.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/descriptor_ops.ipp @@ -2,7 +2,7 @@ // detail/impl/descriptor_ops.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.hpp index f6c00a51583..3bb5db23b17 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.hpp @@ -2,7 +2,7 @@ // detail/impl/dev_poll_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.ipp index c1d4fa0fb44..58d6cd79c64 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/dev_poll_reactor.ipp @@ -2,7 +2,7 @@ // detail/impl/dev_poll_reactor.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -67,7 +67,8 @@ void dev_poll_reactor::shutdown() scheduler_.abandon_operations(ops); } -void dev_poll_reactor::notify_fork(asio::io_context::fork_event fork_ev) +void dev_poll_reactor::notify_fork( + asio::execution_context::fork_event fork_ev) { if (fork_ev == asio::execution_context::fork_child) { @@ -234,6 +235,11 @@ void dev_poll_reactor::deregister_internal_descriptor( op_queue_[i].cancel_operations(descriptor, ops, ec); } +void dev_poll_reactor::cleanup_descriptor_data( + dev_poll_reactor::per_descriptor_data&) +{ +} + void dev_poll_reactor::run(long usec, op_queue<operation>& ops) { asio::detail::mutex::scoped_lock lock(mutex_); diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.hpp index a90665405b0..db344b6c133 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.hpp @@ -2,7 +2,7 @@ // detail/impl/epoll_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.ipp index 9a487d4b759..45682de06ee 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/epoll_reactor.ipp @@ -2,7 +2,7 @@ // detail/impl/epoll_reactor.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -383,9 +383,6 @@ void epoll_reactor::deregister_descriptor(socket_type descriptor, context(), static_cast<uintmax_t>(descriptor), reinterpret_cast<uintmax_t>(descriptor_data))); - free_descriptor_state(descriptor_data); - descriptor_data = 0; - scheduler_.post_deferred_completions(ops); } } @@ -415,7 +412,14 @@ void epoll_reactor::deregister_internal_descriptor(socket_type descriptor, ASIO_HANDLER_REACTOR_DEREGISTRATION(( context(), static_cast<uintmax_t>(descriptor), reinterpret_cast<uintmax_t>(descriptor_data))); + } +} +void epoll_reactor::cleanup_descriptor_data( + per_descriptor_data& descriptor_data) +{ + if (descriptor_data) + { free_descriptor_state(descriptor_data); descriptor_data = 0; } @@ -462,6 +466,7 @@ void epoll_reactor::run(long usec, op_queue<operation>& ops) // Ignore. } # endif // defined(ASIO_HAS_TIMERFD) + else { unsigned event_mask = 0; if ((events[i].events & EPOLLIN) != 0) @@ -512,8 +517,15 @@ void epoll_reactor::run(long usec, op_queue<operation>& ops) // don't call work_started() here. This still allows the scheduler to // stop if the only remaining operations are descriptor operations. descriptor_state* descriptor_data = static_cast<descriptor_state*>(ptr); - descriptor_data->set_ready_events(events[i].events); - ops.push(descriptor_data); + if (!ops.is_enqueued(descriptor_data)) + { + descriptor_data->set_ready_events(events[i].events); + ops.push(descriptor_data); + } + else + { + descriptor_data->add_ready_events(events[i].events); + } } } diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/eventfd_select_interrupter.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/eventfd_select_interrupter.ipp index 152bffd213a..8141145145b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/eventfd_select_interrupter.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/eventfd_select_interrupter.ipp @@ -2,7 +2,7 @@ // detail/impl/eventfd_select_interrupter.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Roelof Naude (roelof.naude at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/handler_tracking.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/handler_tracking.ipp index 7e628d0b5f1..b18560152b4 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/handler_tracking.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/handler_tracking.ipp @@ -2,7 +2,7 @@ // detail/impl/handler_tracking.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.hpp index eaa7a55e299..7e3448ff942 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.hpp @@ -2,7 +2,7 @@ // detail/impl/kqueue_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp index 4344e50d015..24599ad115e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/kqueue_reactor.ipp @@ -2,7 +2,7 @@ // detail/impl/kqueue_reactor.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -327,9 +327,6 @@ void kqueue_reactor::deregister_descriptor(socket_type descriptor, context(), static_cast<uintmax_t>(descriptor), reinterpret_cast<uintmax_t>(descriptor_data))); - free_descriptor_state(descriptor_data); - descriptor_data = 0; - scheduler_.post_deferred_completions(ops); } } @@ -363,7 +360,14 @@ void kqueue_reactor::deregister_internal_descriptor(socket_type descriptor, ASIO_HANDLER_REACTOR_DEREGISTRATION(( context(), static_cast<uintmax_t>(descriptor), reinterpret_cast<uintmax_t>(descriptor_data))); + } +} +void kqueue_reactor::cleanup_descriptor_data( + per_descriptor_data& descriptor_data) +{ + if (descriptor_data) + { free_descriptor_state(descriptor_data); descriptor_data = 0; } diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/null_event.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/null_event.ipp index b94f6e5b26a..4409f44f2d6 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/null_event.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/null_event.ipp @@ -2,7 +2,7 @@ // detail/impl/null_event.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/pipe_select_interrupter.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/pipe_select_interrupter.ipp index 435da014dcb..1b3f6b89cef 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/pipe_select_interrupter.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/pipe_select_interrupter.ipp @@ -2,7 +2,7 @@ // detail/impl/pipe_select_interrupter.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_event.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_event.ipp index 14de4c29c8e..09e5754cf99 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_event.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_event.ipp @@ -2,7 +2,7 @@ // detail/impl/posix_event.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_mutex.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_mutex.ipp index c629f6bba7e..427a8ca64ce 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_mutex.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_mutex.ipp @@ -2,7 +2,7 @@ // detail/impl/posix_mutex.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_thread.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_thread.ipp index a4eb2a80f96..c9861f429ba 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_thread.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_thread.ipp @@ -2,7 +2,7 @@ // detail/impl/posix_thread.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_tss_ptr.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_tss_ptr.ipp index 4d35ebca1b5..568fb06e5ef 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/posix_tss_ptr.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/posix_tss_ptr.ipp @@ -2,7 +2,7 @@ // detail/impl/posix_tss_ptr.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_descriptor_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_descriptor_service.ipp index 7aaf3620f16..8a340ed7f8b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_descriptor_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_descriptor_service.ipp @@ -2,7 +2,7 @@ // detail/impl/reactive_descriptor_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -89,10 +89,12 @@ void reactive_descriptor_service::destroy( reactor_.deregister_descriptor(impl.descriptor_, impl.reactor_data_, (impl.state_ & descriptor_ops::possible_dup) == 0); - } - asio::error_code ignored_ec; - descriptor_ops::close(impl.descriptor_, impl.state_, ignored_ec); + asio::error_code ignored_ec; + descriptor_ops::close(impl.descriptor_, impl.state_, ignored_ec); + + reactor_.cleanup_descriptor_data(impl.reactor_data_); + } } asio::error_code reactive_descriptor_service::assign( @@ -130,9 +132,15 @@ asio::error_code reactive_descriptor_service::close( reactor_.deregister_descriptor(impl.descriptor_, impl.reactor_data_, (impl.state_ & descriptor_ops::possible_dup) == 0); - } - descriptor_ops::close(impl.descriptor_, impl.state_, ec); + descriptor_ops::close(impl.descriptor_, impl.state_, ec); + + reactor_.cleanup_descriptor_data(impl.reactor_data_); + } + else + { + ec = asio::error_code(); + } // The descriptor is closed by the OS even if close() returns an error. // @@ -157,6 +165,7 @@ reactive_descriptor_service::release( "descriptor", &impl, impl.descriptor_, "release")); reactor_.deregister_descriptor(impl.descriptor_, impl.reactor_data_, false); + reactor_.cleanup_descriptor_data(impl.reactor_data_); construct(impl); } diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_serial_port_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_serial_port_service.ipp index 7ea37a4b7d9..6f57b7b224c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_serial_port_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_serial_port_service.ipp @@ -2,7 +2,7 @@ // detail/impl/reactive_serial_port_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_socket_service_base.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_socket_service_base.ipp index d258c75f403..890e8a25a1a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_socket_service_base.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/reactive_socket_service_base.ipp @@ -2,7 +2,7 @@ // detail/reactive_socket_service_base.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -90,6 +90,8 @@ void reactive_socket_service_base::destroy( asio::error_code ignored_ec; socket_ops::close(impl.socket_, impl.state_, true, ignored_ec); + + reactor_.cleanup_descriptor_data(impl.reactor_data_); } } @@ -104,9 +106,15 @@ asio::error_code reactive_socket_service_base::close( reactor_.deregister_descriptor(impl.socket_, impl.reactor_data_, (impl.state_ & socket_ops::possible_dup) == 0); - } - socket_ops::close(impl.socket_, impl.state_, false, ec); + socket_ops::close(impl.socket_, impl.state_, false, ec); + + reactor_.cleanup_descriptor_data(impl.reactor_data_); + } + else + { + ec = asio::error_code(); + } // The descriptor is closed by the OS even if close() returns an error. // @@ -126,18 +134,20 @@ socket_type reactive_socket_service_base::release( asio::error_code& ec) { if (!is_open(impl)) + { + ec = asio::error::bad_descriptor; return invalid_socket; + } - cancel(impl, ec); - if (ec) - return invalid_socket; - - reactor_.deregister_descriptor(impl.socket_, impl.reactor_data_, - (impl.state_ & socket_ops::possible_dup) == 0); + ASIO_HANDLER_OPERATION((reactor_.context(), + "socket", &impl, impl.socket_, "release")); - socket_type tmp = impl.socket_; - impl.socket_ = invalid_socket; - return tmp; + reactor_.deregister_descriptor(impl.socket_, impl.reactor_data_, false); + reactor_.cleanup_descriptor_data(impl.reactor_data_); + socket_type sock = impl.socket_; + construct(impl); + ec = asio::error_code(); + return sock; } asio::error_code reactive_socket_service_base::cancel( @@ -246,7 +256,7 @@ void reactive_socket_service_base::start_accept_op( reactor_op* op, bool is_continuation, bool peer_is_open) { if (!peer_is_open) - start_op(impl, reactor::read_op, op, true, is_continuation, false); + start_op(impl, reactor::read_op, op, is_continuation, true, false); else { op->ec_ = asio::error::already_open; diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/resolver_service_base.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/resolver_service_base.ipp index 5899db554fc..0e8b2170d96 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/resolver_service_base.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/resolver_service_base.ipp @@ -2,7 +2,7 @@ // detail/impl/resolver_service_base.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/scheduler.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/scheduler.ipp index 1b204653226..a5e76acd645 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/scheduler.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/scheduler.ipp @@ -2,7 +2,7 @@ // detail/impl/scheduler.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -89,7 +89,9 @@ scheduler::scheduler( : asio::detail::execution_context_service_base<scheduler>(ctx), one_thread_(concurrency_hint == 1 || !ASIO_CONCURRENCY_HINT_IS_LOCKING( - SCHEDULER, concurrency_hint)), + SCHEDULER, concurrency_hint) + || !ASIO_CONCURRENCY_HINT_IS_LOCKING( + REACTOR_IO, concurrency_hint)), mutex_(ASIO_CONCURRENCY_HINT_IS_LOCKING( SCHEDULER, concurrency_hint)), task_(0), diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.hpp index 04e17f880ca..6eed733d74d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.hpp @@ -2,7 +2,7 @@ // detail/impl/select_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.ipp index dc0737bfad8..d7b5f0ab95f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/select_reactor.ipp @@ -2,7 +2,7 @@ // detail/impl/select_reactor.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -180,6 +180,11 @@ void select_reactor::deregister_internal_descriptor( op_queue_[i].cancel_operations(descriptor, ops); } +void select_reactor::cleanup_descriptor_data( + select_reactor::per_descriptor_data&) +{ +} + void select_reactor::run(long usec, op_queue<operation>& ops) { asio::detail::mutex::scoped_lock lock(mutex_); diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.hpp index 1b735e1596a..27b9ba2b2ff 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.hpp @@ -2,7 +2,7 @@ // detail/impl/service_registry.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.ipp index ef1955f743c..e27c70ffd67 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/service_registry.ipp @@ -2,7 +2,7 @@ // detail/impl/service_registry.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/signal_set_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/signal_set_service.ipp index 114a0b1417f..f19f8e2d9a9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/signal_set_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/signal_set_service.ipp @@ -2,7 +2,7 @@ // detail/impl/signal_set_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -189,6 +189,7 @@ void signal_set_service::notify_fork( state->fork_prepared_ = true; lock.unlock(); reactor_.deregister_internal_descriptor(read_descriptor, reactor_data_); + reactor_.cleanup_descriptor_data(reactor_data_); } break; case asio::io_context::fork_parent: @@ -558,8 +559,9 @@ void signal_set_service::remove_service(signal_set_service* service) // Disable the pipe readiness notifications. int read_descriptor = state->read_descriptor_; lock.unlock(); - service->reactor_.deregister_descriptor( - read_descriptor, service->reactor_data_, false); + service->reactor_.deregister_internal_descriptor( + read_descriptor, service->reactor_data_); + service->reactor_.cleanup_descriptor_data(service->reactor_data_); lock.lock(); #endif // !defined(ASIO_WINDOWS) // && !defined(ASIO_WINDOWS_RUNTIME) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/socket_ops.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/socket_ops.ipp index 8b1680e2c8c..d8b457b1dd0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/socket_ops.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/socket_ops.ipp @@ -2,7 +2,7 @@ // detail/impl/socket_ops.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -241,8 +241,6 @@ bool non_blocking_accept(socket_type s, if (ec == asio::error::would_block || ec == asio::error::try_again) { - if (state & user_set_non_blocking) - return true; // Fall through to retry operation. } else if (ec == asio::error::connection_aborted) @@ -3435,7 +3433,6 @@ asio::error_code getnameinfo(const socket_addr_type* addr, using namespace std; // For memcpy. sockaddr_storage_type tmp_addr; memcpy(&tmp_addr, addr, addrlen); - tmp_addr.ss_len = addrlen; addr = reinterpret_cast<socket_addr_type*>(&tmp_addr); clear_last_error(); return getnameinfo_emulation(addr, addrlen, diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/socket_select_interrupter.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/socket_select_interrupter.ipp index 2f4d37771d5..b15b8f486b7 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/socket_select_interrupter.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/socket_select_interrupter.ipp @@ -2,7 +2,7 @@ // detail/impl/socket_select_interrupter.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.hpp index fedea1cf3b4..2fad849705e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.hpp @@ -2,7 +2,7 @@ // detail/impl/strand_executor_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -99,27 +99,23 @@ template <typename Executor, typename Function, typename Allocator> void strand_executor_service::dispatch(const implementation_type& impl, Executor& ex, ASIO_MOVE_ARG(Function) function, const Allocator& a) { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(function)); // If we are already in the strand then the function can run immediately. if (call_stack<strand_impl>::contains(impl.get())) { + // Make a local, non-const copy of the function. + function_type tmp(ASIO_MOVE_CAST(Function)(function)); + fenced_block b(fenced_block::full); asio_handler_invoke_helpers::invoke(tmp, tmp); return; } - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); - // Allocate and construct an operation to wrap the function. - typedef executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(function), a); ASIO_HANDLER_CREATION((impl->service_->context(), *p.p, "strand_executor", impl.get(), 0, "dispatch")); @@ -128,7 +124,7 @@ void strand_executor_service::dispatch(const implementation_type& impl, bool first = enqueue(impl, p.p); p.v = p.p = 0; if (first) - ex.dispatch(invoker<Executor>(impl, ex), allocator); + ex.dispatch(invoker<Executor>(impl, ex), a); } // Request invocation of the given function and return immediately. @@ -136,19 +132,12 @@ template <typename Executor, typename Function, typename Allocator> void strand_executor_service::post(const implementation_type& impl, Executor& ex, ASIO_MOVE_ARG(Function) function, const Allocator& a) { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(function)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(function), a); ASIO_HANDLER_CREATION((impl->service_->context(), *p.p, "strand_executor", impl.get(), 0, "post")); @@ -157,7 +146,7 @@ void strand_executor_service::post(const implementation_type& impl, bool first = enqueue(impl, p.p); p.v = p.p = 0; if (first) - ex.post(invoker<Executor>(impl, ex), allocator); + ex.post(invoker<Executor>(impl, ex), a); } // Request invocation of the given function and return immediately. @@ -165,19 +154,12 @@ template <typename Executor, typename Function, typename Allocator> void strand_executor_service::defer(const implementation_type& impl, Executor& ex, ASIO_MOVE_ARG(Function) function, const Allocator& a) { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(function)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(function), a); ASIO_HANDLER_CREATION((impl->service_->context(), *p.p, "strand_executor", impl.get(), 0, "defer")); @@ -186,7 +168,7 @@ void strand_executor_service::defer(const implementation_type& impl, bool first = enqueue(impl, p.p); p.v = p.p = 0; if (first) - ex.defer(invoker<Executor>(impl, ex), allocator); + ex.defer(invoker<Executor>(impl, ex), a); } } // namespace detail diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.ipp index 3baadcb07be..91f80d74d00 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_executor_service.ipp @@ -2,7 +2,7 @@ // detail/impl/strand_executor_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.hpp index 00b88a42bb1..dfeeaf5ab0e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.hpp @@ -2,7 +2,7 @@ // detail/impl/strand_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.ipp index 16946dcab67..5b6e8ee5142 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/strand_service.ipp @@ -2,7 +2,7 @@ // detail/impl/strand_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/throw_error.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/throw_error.ipp index d59eca2d8e2..67ca630924f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/throw_error.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/throw_error.ipp @@ -2,7 +2,7 @@ // detail/impl/throw_error.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_ptime.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_ptime.ipp index 10c42956843..2a809f497b5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_ptime.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_ptime.ipp @@ -2,7 +2,7 @@ // detail/impl/timer_queue_ptime.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_set.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_set.ipp index a6831820fdc..fb7a91365f5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_set.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/timer_queue_set.ipp @@ -2,7 +2,7 @@ // detail/impl/timer_queue_set.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_event.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_event.ipp index e3d77e68d8c..4c63fd5f0d9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_event.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_event.ipp @@ -2,7 +2,7 @@ // detail/win_event.ipp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_handle_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_handle_service.ipp index 7e6fcb9015c..b5bcc4c37fe 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_handle_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_handle_service.ipp @@ -2,7 +2,7 @@ // detail/impl/win_iocp_handle_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.hpp index 4d1d75a9187..9a61eb3d2b5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.hpp @@ -2,7 +2,7 @@ // detail/impl/win_iocp_io_context.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.ipp index d4a16381d8d..f9de2618b49 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_io_context.ipp @@ -2,7 +2,7 @@ // detail/impl/win_iocp_io_context.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_serial_port_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_serial_port_service.ipp index d84f4b2130b..9f18a09bfd3 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_serial_port_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_serial_port_service.ipp @@ -2,7 +2,7 @@ // detail/impl/win_iocp_serial_port_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp index 758726f6600..5b64d64359d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp @@ -2,7 +2,7 @@ // detail/impl/win_iocp_socket_service_base.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -45,7 +45,6 @@ void win_iocp_socket_service_base::base_shutdown() base_implementation_type* impl = impl_list_; while (impl) { - asio::error_code ignored_ec; close_for_destruction(*impl); impl = impl->next_; } @@ -178,9 +177,16 @@ asio::error_code win_iocp_socket_service_base::close( reinterpret_cast<void**>(&reactor_), 0, 0)); if (r) r->deregister_descriptor(impl.socket_, impl.reactor_data_, true); - } - socket_ops::close(impl.socket_, impl.state_, false, ec); + socket_ops::close(impl.socket_, impl.state_, false, ec); + + if (r) + r->cleanup_descriptor_data(impl.reactor_data_); + } + else + { + ec = asio::error_code(); + } impl.socket_ = invalid_socket; impl.state_ = 0; @@ -665,10 +671,14 @@ void win_iocp_socket_service_base::close_for_destruction( reinterpret_cast<void**>(&reactor_), 0, 0)); if (r) r->deregister_descriptor(impl.socket_, impl.reactor_data_, true); + + asio::error_code ignored_ec; + socket_ops::close(impl.socket_, impl.state_, true, ignored_ec); + + if (r) + r->cleanup_descriptor_data(impl.reactor_data_); } - asio::error_code ignored_ec; - socket_ops::close(impl.socket_, impl.state_, true, ignored_ec); impl.socket_ = invalid_socket; impl.state_ = 0; impl.cancel_token_.reset(); @@ -744,7 +754,7 @@ win_iocp_socket_service_base::get_nt_set_info() void* ptr = interlocked_compare_exchange_pointer(&nt_set_info_, 0, 0); if (!ptr) { - if (HMODULE h = GetModuleHandleA("NTDLL.DLL")) + if (HMODULE h = ::GetModuleHandleA("NTDLL.DLL")) ptr = reinterpret_cast<void*>(GetProcAddress(h, "NtSetInformationFile")); // On failure, set nt_set_info_ to a special value to indicate that the diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_mutex.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_mutex.ipp index 61198b5e36d..faa521d449c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_mutex.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_mutex.ipp @@ -2,7 +2,7 @@ // detail/impl/win_mutex.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_object_handle_service.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_object_handle_service.ipp index 9b3da7f0959..0452c8a371b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_object_handle_service.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_object_handle_service.ipp @@ -2,7 +2,7 @@ // detail/impl/win_object_handle_service.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2011 Boris Schaeling (boris@highscore.de) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_static_mutex.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_static_mutex.ipp index bf264a92dd5..df51f37b423 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_static_mutex.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_static_mutex.ipp @@ -2,7 +2,7 @@ // detail/impl/win_static_mutex.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_thread.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_thread.ipp index 4269e6b8b77..20266f068af 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_thread.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_thread.ipp @@ -2,7 +2,7 @@ // detail/impl/win_thread.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/win_tss_ptr.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/win_tss_ptr.ipp index 75a436c942f..7f50fd3f164 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/win_tss_ptr.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/win_tss_ptr.ipp @@ -2,7 +2,7 @@ // detail/impl/win_tss_ptr.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_ssocket_service_base.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_ssocket_service_base.ipp index 46a5439ba4c..ea815f1fb2d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_ssocket_service_base.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_ssocket_service_base.ipp @@ -2,7 +2,7 @@ // detail/impl/winrt_ssocket_service_base.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.hpp b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.hpp index e8447316d29..47fd77c1a79 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.hpp @@ -2,7 +2,7 @@ // detail/impl/winrt_timer_scheduler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.ipp index 2bc92b764b0..d0b06b0d2b2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/winrt_timer_scheduler.ipp @@ -2,7 +2,7 @@ // detail/impl/winrt_timer_scheduler.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/impl/winsock_init.ipp b/src/third_party/asio-master/asio/include/asio/detail/impl/winsock_init.ipp index 094b58bdc54..ea340384e2d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/impl/winsock_init.ipp +++ b/src/third_party/asio-master/asio/include/asio/detail/impl/winsock_init.ipp @@ -2,7 +2,7 @@ // detail/impl/winsock_init.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/io_control.hpp b/src/third_party/asio-master/asio/include/asio/detail/io_control.hpp index 81b3d49c71c..6d9fa2d3cf2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/io_control.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/io_control.hpp @@ -2,7 +2,7 @@ // detail/io_control.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/is_buffer_sequence.hpp b/src/third_party/asio-master/asio/include/asio/detail/is_buffer_sequence.hpp index 95f29c503fd..bd6d7c1d526 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/is_buffer_sequence.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/is_buffer_sequence.hpp @@ -2,7 +2,7 @@ // detail/is_buffer_sequence.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/is_executor.hpp b/src/third_party/asio-master/asio/include/asio/detail/is_executor.hpp index ec0ee001bbc..a1c5a533305 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/is_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/is_executor.hpp @@ -2,7 +2,7 @@ // detail/is_executor.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/keyword_tss_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/keyword_tss_ptr.hpp index c1f9b93131d..a8372a7b128 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/keyword_tss_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/keyword_tss_ptr.hpp @@ -2,7 +2,7 @@ // detail/keyword_tss_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/kqueue_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/kqueue_reactor.hpp index 8d1c66737d5..3596a8043de 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/kqueue_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/kqueue_reactor.hpp @@ -2,7 +2,7 @@ // detail/kqueue_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2005 Stefan Arentz (stefan at soze dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -132,14 +132,22 @@ public: per_descriptor_data& descriptor_data); // Cancel any operations that are running against the descriptor and remove - // its registration from the reactor. + // its registration from the reactor. The reactor resources associated with + // the descriptor must be released by calling cleanup_descriptor_data. ASIO_DECL void deregister_descriptor(socket_type descriptor, per_descriptor_data& descriptor_data, bool closing); - // Remote the descriptor's registration from the reactor. + // Remove the descriptor's registration from the reactor. The reactor + // resources associated with the descriptor must be released by calling + // cleanup_descriptor_data. ASIO_DECL void deregister_internal_descriptor( socket_type descriptor, per_descriptor_data& descriptor_data); + // Perform any post-deregistration cleanup tasks associated with the + // descriptor data. + ASIO_DECL void cleanup_descriptor_data( + per_descriptor_data& descriptor_data); + // Add a new timer queue to the reactor. template <typename Time_Traits> void add_timer_queue(timer_queue<Time_Traits>& queue); diff --git a/src/third_party/asio-master/asio/include/asio/detail/local_free_on_block_exit.hpp b/src/third_party/asio-master/asio/include/asio/detail/local_free_on_block_exit.hpp index a0ea47cceff..0ab6453ed00 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/local_free_on_block_exit.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/local_free_on_block_exit.hpp @@ -2,7 +2,7 @@ // detail/local_free_on_block_exit.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/macos_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/macos_fenced_block.hpp index e44b900bbda..584dcbe44db 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/macos_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/macos_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/macos_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/memory.hpp b/src/third_party/asio-master/asio/include/asio/detail/memory.hpp index 04bad7e747b..64fc5d03aa5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/memory.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/memory.hpp @@ -2,7 +2,7 @@ // detail/memory.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/mutex.hpp index 9821e818093..e1fae1caf15 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/mutex.hpp @@ -2,7 +2,7 @@ // detail/mutex.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/noncopyable.hpp b/src/third_party/asio-master/asio/include/asio/detail/noncopyable.hpp index 31f646a5655..18ed35b7d26 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/noncopyable.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/noncopyable.hpp @@ -2,7 +2,7 @@ // detail/noncopyable.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_event.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_event.hpp index 465a701123b..0bd107d3862 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_event.hpp @@ -2,7 +2,7 @@ // detail/null_event.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_fenced_block.hpp index 2ec3554d001..3c38fd55dd5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/null_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_global.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_global.hpp index 7d3c0dfb03b..9126201bd87 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_global.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_global.hpp @@ -2,7 +2,7 @@ // detail/null_global.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_mutex.hpp index 582ab1dc70d..fde34a6e0bc 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_mutex.hpp @@ -2,7 +2,7 @@ // detail/null_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_reactor.hpp index 3b6f1d47705..79f015beaa4 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_reactor.hpp @@ -2,7 +2,7 @@ // detail/null_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_signal_blocker.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_signal_blocker.hpp index 9992bd6653b..5954743e889 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_signal_blocker.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_signal_blocker.hpp @@ -2,7 +2,7 @@ // detail/null_signal_blocker.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_socket_service.hpp index 946b90f6a08..ef814ef91ec 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_socket_service.hpp @@ -2,7 +2,7 @@ // detail/null_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_static_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_static_mutex.hpp index ee301206354..376ab6c3bf0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_static_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_static_mutex.hpp @@ -2,7 +2,7 @@ // detail/null_static_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_thread.hpp index eb1753faa27..81526049b60 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_thread.hpp @@ -2,7 +2,7 @@ // detail/null_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/null_tss_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/null_tss_ptr.hpp index 5277ee5d155..38193765d61 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/null_tss_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/null_tss_ptr.hpp @@ -2,7 +2,7 @@ // detail/null_tss_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/object_pool.hpp b/src/third_party/asio-master/asio/include/asio/detail/object_pool.hpp index 82a6dd7d158..34542ed600e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/object_pool.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/object_pool.hpp @@ -2,7 +2,7 @@ // detail/object_pool.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/old_win_sdk_compat.hpp b/src/third_party/asio-master/asio/include/asio/detail/old_win_sdk_compat.hpp index 9b34816ec1c..90010e97ca2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/old_win_sdk_compat.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/old_win_sdk_compat.hpp @@ -2,7 +2,7 @@ // detail/old_win_sdk_compat.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/op_queue.hpp b/src/third_party/asio-master/asio/include/asio/detail/op_queue.hpp index 1ab40465143..7f48f5b9315 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/op_queue.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/op_queue.hpp @@ -2,7 +2,7 @@ // detail/op_queue.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -138,6 +138,12 @@ public: return front_ == 0; } + // Test whether an operation is already enqueued. + bool is_enqueued(Operation* o) const + { + return op_queue_access::next(o) != 0 || back_ == o; + } + private: friend class op_queue_access; diff --git a/src/third_party/asio-master/asio/include/asio/detail/operation.hpp b/src/third_party/asio-master/asio/include/asio/detail/operation.hpp index 72144d6d881..6514d9a368f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/operation.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/operation.hpp @@ -2,7 +2,7 @@ // detail/operation.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/pipe_select_interrupter.hpp b/src/third_party/asio-master/asio/include/asio/detail/pipe_select_interrupter.hpp index b339def0c6b..1f57fc096a1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/pipe_select_interrupter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/pipe_select_interrupter.hpp @@ -2,7 +2,7 @@ // detail/pipe_select_interrupter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/pop_options.hpp b/src/third_party/asio-master/asio/include/asio/detail/pop_options.hpp index 880121f63eb..51e826de35f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/pop_options.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/pop_options.hpp @@ -2,7 +2,7 @@ // detail/pop_options.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_event.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_event.hpp index f639b939c26..57acc6dae01 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_event.hpp @@ -2,7 +2,7 @@ // detail/posix_event.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_fd_set_adapter.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_fd_set_adapter.hpp index 5ab9c8e8591..9c246df1962 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_fd_set_adapter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_fd_set_adapter.hpp @@ -2,7 +2,7 @@ // detail/posix_fd_set_adapter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_global.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_global.hpp index bb9373bafbe..152c7c99d44 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_global.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_global.hpp @@ -2,7 +2,7 @@ // detail/posix_global.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_mutex.hpp index 08b220b98fd..cf49731a3a5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_mutex.hpp @@ -2,7 +2,7 @@ // detail/posix_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_signal_blocker.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_signal_blocker.hpp index dc476fd7387..100a05d6d88 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_signal_blocker.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_signal_blocker.hpp @@ -2,7 +2,7 @@ // detail/posix_signal_blocker.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_static_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_static_mutex.hpp index e65d09affdf..4d316637773 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_static_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_static_mutex.hpp @@ -2,7 +2,7 @@ // detail/posix_static_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_thread.hpp index a07d5b3b003..fba2a2dd651 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_thread.hpp @@ -2,7 +2,7 @@ // detail/posix_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/posix_tss_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/posix_tss_ptr.hpp index a677d15dc5f..3fce2c63d7a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/posix_tss_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/posix_tss_ptr.hpp @@ -2,7 +2,7 @@ // detail/posix_tss_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/push_options.hpp b/src/third_party/asio-master/asio/include/asio/detail/push_options.hpp index 384bab13eda..ecdcb7c4f85 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/push_options.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/push_options.hpp @@ -2,7 +2,7 @@ // detail/push_options.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_descriptor_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_descriptor_service.hpp index 42bc3df55b5..b0b53ee5e17 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_descriptor_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_descriptor_service.hpp @@ -2,7 +2,7 @@ // detail/reactive_descriptor_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_null_buffers_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_null_buffers_op.hpp index 504e4f66b11..178a01bfacd 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_null_buffers_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_null_buffers_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_null_buffers_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_serial_port_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_serial_port_service.hpp index 986e87b45fe..8709595056f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_serial_port_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_serial_port_service.hpp @@ -2,7 +2,7 @@ // detail/reactive_serial_port_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_accept_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_accept_op.hpp index 11b81d5168d..da8f0ef7f37 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_accept_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_accept_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_accept_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_connect_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_connect_op.hpp index 428db3f8e39..4289bd9c07b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_connect_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_connect_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_connect_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recv_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recv_op.hpp index cb19a9dea4f..f646e7c84d0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recv_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recv_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_recv_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvfrom_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvfrom_op.hpp index 309a032a7ab..e0ed1773975 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvfrom_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvfrom_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_recvfrom_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvmsg_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvmsg_op.hpp index e0c801fd86d..4f9370b97bd 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvmsg_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_recvmsg_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_recvmsg_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_send_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_send_op.hpp index 708e8ea0d97..88092cd89af 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_send_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_send_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_send_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_sendto_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_sendto_op.hpp index cab8f88a086..fdb9b645852 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_sendto_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_sendto_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_sendto_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service.hpp index 968ac487061..b7b264806a9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service_base.hpp index ca8a5e7f502..a8e72ac6d57 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_socket_service_base.hpp @@ -2,7 +2,7 @@ // detail/reactive_socket_service_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactive_wait_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactive_wait_op.hpp index 99f8811cf9a..7bd7e2f77e7 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactive_wait_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactive_wait_op.hpp @@ -2,7 +2,7 @@ // detail/reactive_wait_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactor.hpp index 1f684a22e2b..edf7816f752 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactor.hpp @@ -2,7 +2,7 @@ // detail/reactor.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactor_fwd.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactor_fwd.hpp index 1b25e69a281..caeb53e220e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactor_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactor_fwd.hpp @@ -2,7 +2,7 @@ // detail/reactor_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactor_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactor_op.hpp index 491787b09f2..bdbaefe4613 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactor_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactor_op.hpp @@ -2,7 +2,7 @@ // detail/reactor_op.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/reactor_op_queue.hpp b/src/third_party/asio-master/asio/include/asio/detail/reactor_op_queue.hpp index 426adfbc94d..af4e0cbb094 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/reactor_op_queue.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/reactor_op_queue.hpp @@ -2,7 +2,7 @@ // detail/reactor_op_queue.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/recycling_allocator.hpp b/src/third_party/asio-master/asio/include/asio/detail/recycling_allocator.hpp index bd2908a90dc..11e28f98f3a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/recycling_allocator.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/recycling_allocator.hpp @@ -2,7 +2,7 @@ // detail/recycling_allocator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/regex_fwd.hpp b/src/third_party/asio-master/asio/include/asio/detail/regex_fwd.hpp index 447c6b13fd6..32f3f759fba 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/regex_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/regex_fwd.hpp @@ -2,7 +2,7 @@ // detail/regex_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/resolve_endpoint_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/resolve_endpoint_op.hpp index 234ac2421f1..5efc4c5efd1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/resolve_endpoint_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/resolve_endpoint_op.hpp @@ -2,7 +2,7 @@ // detail/resolve_endpoint_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/resolve_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/resolve_op.hpp index 724edc557ec..4e6bfd8e195 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/resolve_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/resolve_op.hpp @@ -2,7 +2,7 @@ // detail/resolve_op.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/resolve_query_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/resolve_query_op.hpp index 0ce450b5ea5..d68cb7e9f28 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/resolve_query_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/resolve_query_op.hpp @@ -2,7 +2,7 @@ // detail/resolve_query_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -67,7 +67,6 @@ public: // Take ownership of the operation object. resolve_query_op* o(static_cast<resolve_query_op*>(base)); ptr p = { asio::detail::addressof(o->handler_), o, o }; - handler_work<Handler> w(o->handler_); if (owner && owner != &o->io_context_impl_) { @@ -88,6 +87,9 @@ public: // The operation has been returned to the main io_context. The completion // handler is ready to be delivered. + // Take ownership of the operation's outstanding work. + handler_work<Handler> w(o->handler_); + ASIO_HANDLER_COMPLETION((*o)); // Make a copy of the handler so that the memory can be deallocated diff --git a/src/third_party/asio-master/asio/include/asio/detail/resolver_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/resolver_service.hpp index 155e4f30225..cee380a2b47 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/resolver_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/resolver_service.hpp @@ -2,7 +2,7 @@ // detail/resolver_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/resolver_service_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/resolver_service_base.hpp index e3dd4f7edd7..aa6ff1e4af6 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/resolver_service_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/resolver_service_base.hpp @@ -2,7 +2,7 @@ // detail/resolver_service_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/scheduler.hpp b/src/third_party/asio-master/asio/include/asio/detail/scheduler.hpp index 37814723c83..6ff0b7ba707 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/scheduler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/scheduler.hpp @@ -2,7 +2,7 @@ // detail/scheduler.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/scheduler_operation.hpp b/src/third_party/asio-master/asio/include/asio/detail/scheduler_operation.hpp index 112b3dfc3d3..444a9ed19fc 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/scheduler_operation.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/scheduler_operation.hpp @@ -2,7 +2,7 @@ // detail/scheduler_operation.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/scheduler_thread_info.hpp b/src/third_party/asio-master/asio/include/asio/detail/scheduler_thread_info.hpp index aa8260c1d7e..7309707b7fe 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/scheduler_thread_info.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/scheduler_thread_info.hpp @@ -2,7 +2,7 @@ // detail/scheduler_thread_info.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/scoped_lock.hpp b/src/third_party/asio-master/asio/include/asio/detail/scoped_lock.hpp index cf526141691..0c89ec5cbb2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/scoped_lock.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/scoped_lock.hpp @@ -2,7 +2,7 @@ // detail/scoped_lock.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/scoped_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/scoped_ptr.hpp index 3bc26f1a3ea..b1ea0c44c10 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/scoped_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/scoped_ptr.hpp @@ -2,7 +2,7 @@ // detail/scoped_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/select_interrupter.hpp b/src/third_party/asio-master/asio/include/asio/detail/select_interrupter.hpp index ecac7dbfdfd..88b4337731d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/select_interrupter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/select_interrupter.hpp @@ -2,7 +2,7 @@ // detail/select_interrupter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/select_reactor.hpp b/src/third_party/asio-master/asio/include/asio/detail/select_reactor.hpp index 7f9b55b2174..7faa2585078 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/select_reactor.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/select_reactor.hpp @@ -2,7 +2,7 @@ // detail/select_reactor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -106,13 +106,20 @@ public: ASIO_DECL void cancel_ops(socket_type descriptor, per_descriptor_data&); // Cancel any operations that are running against the descriptor and remove - // its registration from the reactor. + // its registration from the reactor. The reactor resources associated with + // the descriptor must be released by calling cleanup_descriptor_data. ASIO_DECL void deregister_descriptor(socket_type descriptor, per_descriptor_data&, bool closing); - // Remote the descriptor's registration from the reactor. + // Remove the descriptor's registration from the reactor. The reactor + // resources associated with the descriptor must be released by calling + // cleanup_descriptor_data. ASIO_DECL void deregister_internal_descriptor( - socket_type descriptor, per_descriptor_data& descriptor_data); + socket_type descriptor, per_descriptor_data&); + + // Perform any post-deregistration cleanup tasks associated with the + // descriptor data. + ASIO_DECL void cleanup_descriptor_data(per_descriptor_data&); // Move descriptor registration from one descriptor_data object to another. ASIO_DECL void move_descriptor(socket_type descriptor, diff --git a/src/third_party/asio-master/asio/include/asio/detail/service_registry.hpp b/src/third_party/asio-master/asio/include/asio/detail/service_registry.hpp index 06f49de48a9..3970a288c39 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/service_registry.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/service_registry.hpp @@ -2,7 +2,7 @@ // detail/service_registry.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/signal_blocker.hpp b/src/third_party/asio-master/asio/include/asio/detail/signal_blocker.hpp index f0fac082023..a69488839c2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/signal_blocker.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/signal_blocker.hpp @@ -2,7 +2,7 @@ // detail/signal_blocker.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/signal_handler.hpp b/src/third_party/asio-master/asio/include/asio/detail/signal_handler.hpp index 19fee65c0e4..fa6909058c3 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/signal_handler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/signal_handler.hpp @@ -2,7 +2,7 @@ // detail/signal_handler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/signal_init.hpp b/src/third_party/asio-master/asio/include/asio/detail/signal_init.hpp index 266a3e0d045..7c96f833ba2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/signal_init.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/signal_init.hpp @@ -2,7 +2,7 @@ // detail/signal_init.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/signal_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/signal_op.hpp index 9921de02478..8c42efb196a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/signal_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/signal_op.hpp @@ -2,7 +2,7 @@ // detail/signal_op.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/signal_set_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/signal_set_service.hpp index 58ee99baf3b..301fb8cd763 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/signal_set_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/signal_set_service.hpp @@ -2,7 +2,7 @@ // detail/signal_set_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/socket_holder.hpp b/src/third_party/asio-master/asio/include/asio/detail/socket_holder.hpp index 1c9e7213655..4688f2322fa 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/socket_holder.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/socket_holder.hpp @@ -2,7 +2,7 @@ // detail/socket_holder.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/socket_ops.hpp b/src/third_party/asio-master/asio/include/asio/detail/socket_ops.hpp index 5529a27649a..b1fe32af429 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/socket_ops.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/socket_ops.hpp @@ -2,7 +2,7 @@ // detail/socket_ops.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/socket_option.hpp b/src/third_party/asio-master/asio/include/asio/detail/socket_option.hpp index 02860b92373..c5cdd827b84 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/socket_option.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/socket_option.hpp @@ -2,7 +2,7 @@ // detail/socket_option.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/socket_select_interrupter.hpp b/src/third_party/asio-master/asio/include/asio/detail/socket_select_interrupter.hpp index 7089640ed6d..7f7fc17df29 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/socket_select_interrupter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/socket_select_interrupter.hpp @@ -2,7 +2,7 @@ // detail/socket_select_interrupter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/socket_types.hpp b/src/third_party/asio-master/asio/include/asio/detail/socket_types.hpp index d2e93d108e4..e97dfc13c69 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/socket_types.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/socket_types.hpp @@ -2,7 +2,7 @@ // detail/socket_types.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -57,7 +57,11 @@ # include "asio/detail/old_win_sdk_compat.hpp" #else # include <sys/ioctl.h> -# if !defined(__SYMBIAN32__) +# if (defined(__MACH__) && defined(__APPLE__)) \ + || defined(__FreeBSD__) || defined(__NetBSD__) \ + || defined(__OpenBSD__) || defined(__linux__) +# include <poll.h> +# elif !defined(__SYMBIAN32__) # include <sys/poll.h> # endif # include <sys/types.h> @@ -147,6 +151,7 @@ typedef int signed_size_type; # define ASIO_OS_DEF_SO_DONTROUTE 0x10 # define ASIO_OS_DEF_SO_KEEPALIVE 0x8 # define ASIO_OS_DEF_SO_LINGER 0x80 +# define ASIO_OS_DEF_SO_OOBINLINE 0x100 # define ASIO_OS_DEF_SO_SNDBUF 0x1001 # define ASIO_OS_DEF_SO_RCVBUF 0x1002 # define ASIO_OS_DEF_SO_SNDLOWAT 0x1003 @@ -231,6 +236,7 @@ typedef int signed_size_type; # define ASIO_OS_DEF_SO_DONTROUTE SO_DONTROUTE # define ASIO_OS_DEF_SO_KEEPALIVE SO_KEEPALIVE # define ASIO_OS_DEF_SO_LINGER SO_LINGER +# define ASIO_OS_DEF_SO_OOBINLINE SO_OOBINLINE # define ASIO_OS_DEF_SO_SNDBUF SO_SNDBUF # define ASIO_OS_DEF_SO_RCVBUF SO_RCVBUF # define ASIO_OS_DEF_SO_SNDLOWAT SO_SNDLOWAT @@ -346,6 +352,7 @@ typedef int signed_size_type; # define ASIO_OS_DEF_SO_DONTROUTE SO_DONTROUTE # define ASIO_OS_DEF_SO_KEEPALIVE SO_KEEPALIVE # define ASIO_OS_DEF_SO_LINGER SO_LINGER +# define ASIO_OS_DEF_SO_OOBINLINE SO_OOBINLINE # define ASIO_OS_DEF_SO_SNDBUF SO_SNDBUF # define ASIO_OS_DEF_SO_RCVBUF SO_RCVBUF # define ASIO_OS_DEF_SO_SNDLOWAT SO_SNDLOWAT diff --git a/src/third_party/asio-master/asio/include/asio/detail/solaris_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/solaris_fenced_block.hpp index c1b599ecd8e..d65532f023c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/solaris_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/solaris_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/solaris_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/static_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/static_mutex.hpp index 1be0a85af90..7875dce4f49 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/static_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/static_mutex.hpp @@ -2,7 +2,7 @@ // detail/static_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_event.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_event.hpp index e05fcca3316..11da0136a6e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_event.hpp @@ -2,7 +2,7 @@ // detail/std_event.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_fenced_block.hpp index 01acf91d60e..49b3101980b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/std_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_global.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_global.hpp index 416f0d3b548..e5894315867 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_global.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_global.hpp @@ -2,7 +2,7 @@ // detail/std_global.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_mutex.hpp index 31af56a36d7..7b185aaa0d5 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_mutex.hpp @@ -2,7 +2,7 @@ // detail/std_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_static_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_static_mutex.hpp index 166ede9aee9..485a8d1efb9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_static_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_static_mutex.hpp @@ -2,7 +2,7 @@ // detail/std_static_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/std_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/std_thread.hpp index f6fcec1621f..8d144abf3ca 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/std_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/std_thread.hpp @@ -2,7 +2,7 @@ // detail/std_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/strand_executor_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/strand_executor_service.hpp index 5ca77a33196..02de974fc51 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/strand_executor_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/strand_executor_service.hpp @@ -2,7 +2,7 @@ // detail/strand_executor_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/strand_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/strand_service.hpp index c5d95e7696f..eb72607309b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/strand_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/strand_service.hpp @@ -2,7 +2,7 @@ // detail/strand_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp index 6f4072d04fa..222c02186d4 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/string_view.hpp @@ -2,7 +2,7 @@ // detail/string_view.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -15,10 +15,10 @@ # pragma once #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) -#if defined(ASIO_HAS_STD_STRING_VIEW) - #include "asio/detail/config.hpp" +#if defined(ASIO_HAS_STD_STRING_VIEW) + #if defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) # include <experimental/string_view> #else // defined(ASIO_HAS_EXPERIMENTAL_STRING_VIEW) diff --git a/src/third_party/asio-master/asio/include/asio/detail/thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/thread.hpp index cfb5bad1455..dc9867593d0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/thread.hpp @@ -2,7 +2,7 @@ // detail/thread.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/thread_context.hpp b/src/third_party/asio-master/asio/include/asio/detail/thread_context.hpp index 66d20d6f541..c0fd06db531 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/thread_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/thread_context.hpp @@ -2,7 +2,7 @@ // detail/thread_context.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/thread_group.hpp b/src/third_party/asio-master/asio/include/asio/detail/thread_group.hpp index 312af44c729..6e62ded89a6 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/thread_group.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/thread_group.hpp @@ -2,7 +2,7 @@ // detail/thread_group.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/thread_info_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/thread_info_base.hpp index 5fc26c30970..ce1b61c2f74 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/thread_info_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/thread_info_base.hpp @@ -2,7 +2,7 @@ // detail/thread_info_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/throw_error.hpp b/src/third_party/asio-master/asio/include/asio/detail/throw_error.hpp index 3c1d59cd36d..e4dba07e3e0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/throw_error.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/throw_error.hpp @@ -2,7 +2,7 @@ // detail/throw_error.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/throw_exception.hpp b/src/third_party/asio-master/asio/include/asio/detail/throw_exception.hpp index a0c3cf85eaa..b401e109f38 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/throw_exception.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/throw_exception.hpp @@ -2,7 +2,7 @@ // detail/throw_exception.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_queue.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_queue.hpp index 1575e03af7b..db5c33d71f2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_queue.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_queue.hpp @@ -2,7 +2,7 @@ // detail/timer_queue.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_base.hpp index 326d05556d9..e0a3f0beb0a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_base.hpp @@ -2,7 +2,7 @@ // detail/timer_queue_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_ptime.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_ptime.hpp index 9d3cb7d0c93..40b3cb0cf3c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_ptime.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_ptime.hpp @@ -2,7 +2,7 @@ // detail/timer_queue_ptime.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_set.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_set.hpp index 38f46d1e0da..4c20b6f0d64 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_queue_set.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_queue_set.hpp @@ -2,7 +2,7 @@ // detail/timer_queue_set.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler.hpp index 190731675e7..8f76fbb8cbf 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler.hpp @@ -2,7 +2,7 @@ // detail/timer_scheduler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler_fwd.hpp b/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler_fwd.hpp index cf27b8c0c93..1fbe9fef1ab 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler_fwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/timer_scheduler_fwd.hpp @@ -2,7 +2,7 @@ // detail/timer_scheduler_fwd.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/tss_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/tss_ptr.hpp index 2d0306153d6..3362719b543 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/tss_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/tss_ptr.hpp @@ -2,7 +2,7 @@ // detail/tss_ptr.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/type_traits.hpp b/src/third_party/asio-master/asio/include/asio/detail/type_traits.hpp index 08665891520..516377149f9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/type_traits.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/type_traits.hpp @@ -2,7 +2,7 @@ // detail/type_traits.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/variadic_templates.hpp b/src/third_party/asio-master/asio/include/asio/detail/variadic_templates.hpp index 272ae28351e..9cb4ca36ef8 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/variadic_templates.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/variadic_templates.hpp @@ -2,7 +2,7 @@ // detail/variadic_templates.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/wait_handler.hpp b/src/third_party/asio-master/asio/include/asio/detail/wait_handler.hpp index 29bcfd75f1c..9f02477a1e1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/wait_handler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/wait_handler.hpp @@ -2,7 +2,7 @@ // detail/wait_handler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/wait_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/wait_op.hpp index 68bb86fd80c..d6e5be99890 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/wait_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/wait_op.hpp @@ -2,7 +2,7 @@ // detail/wait_op.hpp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_event.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_event.hpp index aa04fd5edd3..ee2e74325a1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_event.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_event.hpp @@ -2,7 +2,7 @@ // detail/win_event.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_fd_set_adapter.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_fd_set_adapter.hpp index 7d288f6244a..78d7d1cf1e9 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_fd_set_adapter.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_fd_set_adapter.hpp @@ -2,7 +2,7 @@ // detail/win_fd_set_adapter.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_fenced_block.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_fenced_block.hpp index 42846ca7e96..0e2c59cec4d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_fenced_block.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_fenced_block.hpp @@ -2,7 +2,7 @@ // detail/win_fenced_block.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_global.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_global.hpp index 92ebdadfa8b..c6aea0fe603 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_global.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_global.hpp @@ -2,7 +2,7 @@ // detail/win_global.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_read_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_read_op.hpp index c3ff79b0959..16afc219f83 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_read_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_read_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_handle_read_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_service.hpp index a1d07bd0531..37358c8416d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_service.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_handle_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_write_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_write_op.hpp index 36019c88aa4..590180dfc3f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_write_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_handle_write_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_handle_write_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_io_context.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_io_context.hpp index 8b6803db792..c6a8d2bd965 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_io_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_io_context.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_io_context.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_null_buffers_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_null_buffers_op.hpp index f9e296debc1..1502bf2f32a 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_null_buffers_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_null_buffers_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_null_buffers_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_operation.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_operation.hpp index 9f888b19498..9e14d14f683 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_operation.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_operation.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_operation.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_op.hpp index fde9a92c70a..1121a1fe860 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_overlapped_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_ptr.hpp index 22025fd5fad..130312d3d49 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_overlapped_ptr.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_overlapped_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_serial_port_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_serial_port_service.hpp index 53856460c72..ca6fdc7a21d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_serial_port_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_serial_port_service.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_serial_port_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_accept_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_accept_op.hpp index 937f4c0f6f3..b1a01bd4c47 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_accept_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_accept_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_accept_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_connect_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_connect_op.hpp index 4edd869c479..af5bc08f34d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_connect_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_connect_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_connect_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recv_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recv_op.hpp index 98b000548d9..d82bd0cbec2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recv_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recv_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_recv_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvfrom_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvfrom_op.hpp index a7af87846d7..071ce6eb89b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvfrom_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvfrom_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_recvfrom_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp index 9e5952f6ce6..a3760c18b86 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_recvmsg_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_recvmsg_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_send_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_send_op.hpp index 15c88a55014..7740763cc81 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_send_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_send_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_send_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service.hpp index ec937e26ea4..ab099f6eab1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service_base.hpp index c27240a5cff..220e8c80925 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_socket_service_base.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_socket_service_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_thread_info.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_thread_info.hpp index ae13dd47100..4a24d1e7dbe 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_thread_info.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_thread_info.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_thread_info.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_wait_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_wait_op.hpp index d5178d04734..04ad5f69430 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_iocp_wait_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_iocp_wait_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_wait_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_mutex.hpp index 350a02dce2a..67c077e0ae1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_mutex.hpp @@ -2,7 +2,7 @@ // detail/win_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_object_handle_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_object_handle_service.hpp index 59605549f42..fad6b815268 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_object_handle_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_object_handle_service.hpp @@ -2,7 +2,7 @@ // detail/win_object_handle_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2011 Boris Schaeling (boris@highscore.de) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_static_mutex.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_static_mutex.hpp index 6f0e75b4109..420110d09ce 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_static_mutex.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_static_mutex.hpp @@ -2,7 +2,7 @@ // detail/win_static_mutex.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_thread.hpp index ab2ba8d95bc..e5a92caeada 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_thread.hpp @@ -2,7 +2,7 @@ // detail/win_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/win_tss_ptr.hpp b/src/third_party/asio-master/asio/include/asio/detail/win_tss_ptr.hpp index 490c705783d..3e0c13e1f1c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/win_tss_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/win_tss_ptr.hpp @@ -2,7 +2,7 @@ // detail/win_tss_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winapp_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/winapp_thread.hpp index 4d13109bdf0..be4e21d77a0 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winapp_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winapp_thread.hpp @@ -2,7 +2,7 @@ // detail/winapp_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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,8 +19,8 @@ #if defined(ASIO_WINDOWS) && defined(ASIO_WINDOWS_APP) -#include "asio/detail/memory.hpp" #include "asio/detail/noncopyable.hpp" +#include "asio/detail/scoped_ptr.hpp" #include "asio/detail/socket_types.hpp" #include "asio/detail/throw_error.hpp" #include "asio/error.hpp" @@ -40,7 +40,7 @@ public: template <typename Function> winapp_thread(Function f, unsigned int = 0) { - std::auto_ptr<func_base> arg(new func<Function>(f)); + scoped_ptr<func_base> arg(new func<Function>(f)); DWORD thread_id = 0; thread_ = ::CreateThread(0, 0, winapp_thread_function, arg.get(), 0, &thread_id); @@ -108,7 +108,7 @@ private: inline DWORD WINAPI winapp_thread_function(LPVOID arg) { - std::auto_ptr<winapp_thread::func_base> func( + scoped_ptr<winapp_thread::func_base> func( static_cast<winapp_thread::func_base*>(arg)); func->run(); return 0; diff --git a/src/third_party/asio-master/asio/include/asio/detail/wince_thread.hpp b/src/third_party/asio-master/asio/include/asio/detail/wince_thread.hpp index 5e0d4ec0250..18b5209106f 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/wince_thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/wince_thread.hpp @@ -2,7 +2,7 @@ // detail/wince_thread.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_async_manager.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_async_manager.hpp index 921dfdd6274..56b342be402 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_async_manager.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_async_manager.hpp @@ -2,7 +2,7 @@ // detail/winrt_async_manager.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_async_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_async_op.hpp index 2b18b431f56..ca436ef7c38 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_async_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_async_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_async_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_resolve_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_resolve_op.hpp index a197c3d3757..01dca8e2eda 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_resolve_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_resolve_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_resolve_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_resolver_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_resolver_service.hpp index 8e38331c234..9947d3ccb1d 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_resolver_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_resolver_service.hpp @@ -2,7 +2,7 @@ // detail/winrt_resolver_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_connect_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_connect_op.hpp index 94b4048250d..0e6aaeb67b1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_connect_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_connect_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_socket_connect_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_recv_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_recv_op.hpp index d19f1f734f3..49b1323f2c6 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_recv_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_recv_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_socket_recv_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_send_op.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_send_op.hpp index 6d16ef3f5cd..9fbb65af53c 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_send_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_socket_send_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_socket_send_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service.hpp index f62131a312c..616df7ec98e 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service.hpp @@ -2,7 +2,7 @@ // detail/winrt_ssocket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service_base.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service_base.hpp index c491c23c937..849408c5518 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_ssocket_service_base.hpp @@ -2,7 +2,7 @@ // detail/winrt_ssocket_service_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_timer_scheduler.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_timer_scheduler.hpp index f3ffe6113e8..93847f4abd2 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_timer_scheduler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_timer_scheduler.hpp @@ -2,7 +2,7 @@ // detail/winrt_timer_scheduler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/winrt_utils.hpp b/src/third_party/asio-master/asio/include/asio/detail/winrt_utils.hpp index 52f714300ac..4808fdc71c1 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winrt_utils.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winrt_utils.hpp @@ -2,7 +2,7 @@ // detail/winrt_utils.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -82,7 +82,8 @@ inline Windows::Storage::Streams::IBuffer^ buffer_dup( const ConstBufferSequence& buffers) { using Microsoft::WRL::ComPtr; - std::size_t size = asio::buffer_size(buffers); + using asio::buffer_size; + std::size_t size = buffer_size(buffers); auto b = ref new Windows::Storage::Streams::Buffer(size); ComPtr<IInspectable> insp = reinterpret_cast<IInspectable*>(b); ComPtr<Windows::Storage::Streams::IBufferByteAccess> bacc; diff --git a/src/third_party/asio-master/asio/include/asio/detail/winsock_init.hpp b/src/third_party/asio-master/asio/include/asio/detail/winsock_init.hpp index b88cd518c98..e82787f0701 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/winsock_init.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/winsock_init.hpp @@ -2,7 +2,7 @@ // detail/winsock_init.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/detail/work_dispatcher.hpp b/src/third_party/asio-master/asio/include/asio/detail/work_dispatcher.hpp index 460fbd6c03e..af242afd500 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/work_dispatcher.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/work_dispatcher.hpp @@ -2,7 +2,7 @@ // detail/work_dispatcher.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -52,10 +52,10 @@ public: void operator()() { - typename associated_executor<Handler>::type ex(work_.get_executor()); typename associated_allocator<Handler>::type alloc( (get_associated_allocator)(handler_)); - ex.dispatch(ASIO_MOVE_CAST(Handler)(handler_), alloc); + work_.get_executor().dispatch( + ASIO_MOVE_CAST(Handler)(handler_), alloc); work_.reset(); } diff --git a/src/third_party/asio-master/asio/include/asio/detail/wrapped_handler.hpp b/src/third_party/asio-master/asio/include/asio/detail/wrapped_handler.hpp index aff903ed38f..a6d8620917b 100644 --- a/src/third_party/asio-master/asio/include/asio/detail/wrapped_handler.hpp +++ b/src/third_party/asio-master/asio/include/asio/detail/wrapped_handler.hpp @@ -2,7 +2,7 @@ // detail/wrapped_handler.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/dispatch.hpp b/src/third_party/asio-master/asio/include/asio/dispatch.hpp index 2addadcb806..87a7726e1ea 100644 --- a/src/third_party/asio-master/asio/include/asio/dispatch.hpp +++ b/src/third_party/asio-master/asio/include/asio/dispatch.hpp @@ -2,7 +2,7 @@ // dispatch.hpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/error.hpp b/src/third_party/asio-master/asio/include/asio/error.hpp index 3566c3ad668..a9ebc532b87 100644 --- a/src/third_party/asio-master/asio/include/asio/error.hpp +++ b/src/third_party/asio-master/asio/include/asio/error.hpp @@ -2,7 +2,7 @@ // error.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -336,7 +336,7 @@ namespace socket_errc { namespace resolver_errc { // Simulates the proposed resolver_errc scoped enum. using error::host_not_found; - using error::host_not_found_try_again; + const error::netdb_errors try_again = error::host_not_found_try_again; using error::service_not_found; } // namespace resolver_errc } // namespace asio diff --git a/src/third_party/asio-master/asio/include/asio/error_code.hpp b/src/third_party/asio-master/asio/include/asio/error_code.hpp index 09a2acb2f6b..73fbb742223 100644 --- a/src/third_party/asio-master/asio/include/asio/error_code.hpp +++ b/src/third_party/asio-master/asio/include/asio/error_code.hpp @@ -2,7 +2,7 @@ // error_code.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/execution_context.hpp b/src/third_party/asio-master/asio/include/asio/execution_context.hpp index 0d91195410e..80f39885112 100644 --- a/src/third_party/asio-master/asio/include/asio/execution_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/execution_context.hpp @@ -2,7 +2,7 @@ // execution_context.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/executor.hpp b/src/third_party/asio-master/asio/include/asio/executor.hpp index f22b99191f6..b66a3928306 100644 --- a/src/third_party/asio-master/asio/include/asio/executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/executor.hpp @@ -2,7 +2,7 @@ // executor.hpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/executor_work_guard.hpp b/src/third_party/asio-master/asio/include/asio/executor_work_guard.hpp index a791dcd41f3..1c59b20814a 100644 --- a/src/third_party/asio-master/asio/include/asio/executor_work_guard.hpp +++ b/src/third_party/asio-master/asio/include/asio/executor_work_guard.hpp @@ -2,7 +2,7 @@ // executor_work_guard.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/basic_endpoint.hpp b/src/third_party/asio-master/asio/include/asio/generic/basic_endpoint.hpp index 1faf4a174b5..7ded1344e11 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/basic_endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/basic_endpoint.hpp @@ -2,7 +2,7 @@ // generic/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/datagram_protocol.hpp b/src/third_party/asio-master/asio/include/asio/generic/datagram_protocol.hpp index 21a39de204f..8526b5f3d01 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/datagram_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/datagram_protocol.hpp @@ -2,7 +2,7 @@ // generic/datagram_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/detail/endpoint.hpp b/src/third_party/asio-master/asio/include/asio/generic/detail/endpoint.hpp index 8de7b2aaed3..23b1d6e2d18 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/detail/endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/detail/endpoint.hpp @@ -2,7 +2,7 @@ // generic/detail/endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/detail/impl/endpoint.ipp b/src/third_party/asio-master/asio/include/asio/generic/detail/impl/endpoint.ipp index 1a66fb95665..cfdfbbffa22 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/detail/impl/endpoint.ipp +++ b/src/third_party/asio-master/asio/include/asio/generic/detail/impl/endpoint.ipp @@ -2,7 +2,7 @@ // generic/detail/impl/endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/raw_protocol.hpp b/src/third_party/asio-master/asio/include/asio/generic/raw_protocol.hpp index 9a7407335c5..b785f99bc21 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/raw_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/raw_protocol.hpp @@ -2,7 +2,7 @@ // generic/raw_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/seq_packet_protocol.hpp b/src/third_party/asio-master/asio/include/asio/generic/seq_packet_protocol.hpp index d01d9cb2baa..a34acf34e55 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/seq_packet_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/seq_packet_protocol.hpp @@ -2,7 +2,7 @@ // generic/seq_packet_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/generic/stream_protocol.hpp b/src/third_party/asio-master/asio/include/asio/generic/stream_protocol.hpp index 6917c199c51..5ea07f35c6a 100644 --- a/src/third_party/asio-master/asio/include/asio/generic/stream_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/generic/stream_protocol.hpp @@ -2,7 +2,7 @@ // generic/stream_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/handler_alloc_hook.hpp b/src/third_party/asio-master/asio/include/asio/handler_alloc_hook.hpp index a05ad4cc097..8bba951b018 100644 --- a/src/third_party/asio-master/asio/include/asio/handler_alloc_hook.hpp +++ b/src/third_party/asio-master/asio/include/asio/handler_alloc_hook.hpp @@ -2,7 +2,7 @@ // handler_alloc_hook.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/handler_continuation_hook.hpp b/src/third_party/asio-master/asio/include/asio/handler_continuation_hook.hpp index bea0cdc5ed8..5a64c070c70 100644 --- a/src/third_party/asio-master/asio/include/asio/handler_continuation_hook.hpp +++ b/src/third_party/asio-master/asio/include/asio/handler_continuation_hook.hpp @@ -2,7 +2,7 @@ // handler_continuation_hook.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/handler_invoke_hook.hpp b/src/third_party/asio-master/asio/include/asio/handler_invoke_hook.hpp index 65c0d08c9d5..d326698be64 100644 --- a/src/third_party/asio-master/asio/include/asio/handler_invoke_hook.hpp +++ b/src/third_party/asio-master/asio/include/asio/handler_invoke_hook.hpp @@ -2,7 +2,7 @@ // handler_invoke_hook.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/handler_type.hpp b/src/third_party/asio-master/asio/include/asio/handler_type.hpp index 49e71231f4d..a40e4b16652 100644 --- a/src/third_party/asio-master/asio/include/asio/handler_type.hpp +++ b/src/third_party/asio-master/asio/include/asio/handler_type.hpp @@ -2,7 +2,7 @@ // handler_type.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/high_resolution_timer.hpp b/src/third_party/asio-master/asio/include/asio/high_resolution_timer.hpp index dd9d4859802..f8a50d25a9c 100644 --- a/src/third_party/asio-master/asio/include/asio/high_resolution_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/high_resolution_timer.hpp @@ -2,7 +2,7 @@ // high_resolution_timer.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp b/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp index c1a2e145490..00a11d8460b 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/buffered_read_stream.hpp @@ -2,7 +2,7 @@ // impl/buffered_read_stream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -201,7 +201,8 @@ template <typename MutableBufferSequence> std::size_t buffered_read_stream<Stream>::read_some( const MutableBufferSequence& buffers) { - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.empty()) @@ -217,7 +218,8 @@ std::size_t buffered_read_stream<Stream>::read_some( { ec = asio::error_code(); - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.empty() && !this->fill(ec)) @@ -379,7 +381,8 @@ buffered_read_stream<Stream>::async_read_some( async_completion<ReadHandler, void (asio::error_code, std::size_t)> init(handler); - if (asio::buffer_size(buffers) == 0 || !storage_.empty()) + using asio::buffer_size; + if (buffer_size(buffers) == 0 || !storage_.empty()) { next_layer_.async_read_some(ASIO_MUTABLE_BUFFER(0, 0), detail::buffered_read_some_handler< diff --git a/src/third_party/asio-master/asio/include/asio/impl/buffered_write_stream.hpp b/src/third_party/asio-master/asio/include/asio/impl/buffered_write_stream.hpp index 4ce6e5ebf04..25290f31f83 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/buffered_write_stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/buffered_write_stream.hpp @@ -2,7 +2,7 @@ // impl/buffered_write_stream.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -182,7 +182,8 @@ template <typename ConstBufferSequence> std::size_t buffered_write_stream<Stream>::write_some( const ConstBufferSequence& buffers) { - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.size() == storage_.capacity()) @@ -198,7 +199,8 @@ std::size_t buffered_write_stream<Stream>::write_some( { ec = asio::error_code(); - if (asio::buffer_size(buffers) == 0) + using asio::buffer_size; + if (buffer_size(buffers) == 0) return 0; if (storage_.size() == storage_.capacity() && !flush(ec)) @@ -246,9 +248,10 @@ namespace detail } else { + using asio::buffer_size; std::size_t orig_size = storage_.size(); std::size_t space_avail = storage_.capacity() - orig_size; - std::size_t bytes_avail = asio::buffer_size(buffers_); + std::size_t bytes_avail = buffer_size(buffers_); std::size_t length = bytes_avail < space_avail ? bytes_avail : space_avail; storage_.resize(orig_size + length); @@ -365,7 +368,8 @@ buffered_write_stream<Stream>::async_write_some( async_completion<WriteHandler, void (asio::error_code, std::size_t)> init(handler); - if (asio::buffer_size(buffers) == 0 + using asio::buffer_size; + if (buffer_size(buffers) == 0 || storage_.size() < storage_.capacity()) { next_layer_.async_write_some(ASIO_CONST_BUFFER(0, 0), @@ -390,9 +394,10 @@ template <typename ConstBufferSequence> std::size_t buffered_write_stream<Stream>::copy( const ConstBufferSequence& buffers) { + using asio::buffer_size; std::size_t orig_size = storage_.size(); std::size_t space_avail = storage_.capacity() - orig_size; - std::size_t bytes_avail = asio::buffer_size(buffers); + std::size_t bytes_avail = buffer_size(buffers); std::size_t length = bytes_avail < space_avail ? bytes_avail : space_avail; storage_.resize(orig_size + length); return asio::buffer_copy( diff --git a/src/third_party/asio-master/asio/include/asio/impl/connect.hpp b/src/third_party/asio-master/asio/include/asio/impl/connect.hpp index 2ab72f6d726..b41f88427d1 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/connect.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/connect.hpp @@ -2,7 +2,7 @@ // impl/connect.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/defer.hpp b/src/third_party/asio-master/asio/include/asio/impl/defer.hpp index cf76ba58fa6..69d7a320d55 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/defer.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/defer.hpp @@ -2,7 +2,7 @@ // impl/defer.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -52,12 +52,10 @@ ASIO_INITFN_RESULT_TYPE(CompletionToken, void()) defer( async_completion<CompletionToken, void()> init(token); - Executor ex1(ex); - typename associated_allocator<handler>::type alloc( (get_associated_allocator)(init.completion_handler)); - ex1.defer(detail::work_dispatcher<handler>(init.completion_handler), alloc); + ex.defer(detail::work_dispatcher<handler>(init.completion_handler), alloc); return init.result.get(); } diff --git a/src/third_party/asio-master/asio/include/asio/impl/dispatch.hpp b/src/third_party/asio-master/asio/include/asio/impl/dispatch.hpp index cfebc5cfde0..dc8f4d0e5a9 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/dispatch.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/dispatch.hpp @@ -2,7 +2,7 @@ // impl/dispatch.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -52,12 +52,10 @@ ASIO_INITFN_RESULT_TYPE(CompletionToken, void()) dispatch( async_completion<CompletionToken, void()> init(token); - Executor ex1(ex); - typename associated_allocator<handler>::type alloc( (get_associated_allocator)(init.completion_handler)); - ex1.dispatch(detail::work_dispatcher<handler>( + ex.dispatch(detail::work_dispatcher<handler>( init.completion_handler), alloc); return init.result.get(); diff --git a/src/third_party/asio-master/asio/include/asio/impl/error.ipp b/src/third_party/asio-master/asio/include/asio/impl/error.ipp index 735178578e5..5be1bcc3ff3 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/error.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/error.ipp @@ -2,7 +2,7 @@ // impl/error.ipp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/error_code.ipp b/src/third_party/asio-master/asio/include/asio/impl/error_code.ipp index c986812d154..55f5b36174d 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/error_code.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/error_code.ipp @@ -2,7 +2,7 @@ // impl/error_code.ipp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/execution_context.hpp b/src/third_party/asio-master/asio/include/asio/impl/execution_context.hpp index 2e44ec11fd7..3cbff32d37b 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/execution_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/execution_context.hpp @@ -2,7 +2,7 @@ // impl/execution_context.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/execution_context.ipp b/src/third_party/asio-master/asio/include/asio/impl/execution_context.ipp index 40bb263f3d8..3d602631b0b 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/execution_context.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/execution_context.ipp @@ -2,7 +2,7 @@ // impl/execution_context.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/executor.hpp b/src/third_party/asio-master/asio/include/asio/impl/executor.hpp index aac223eeef6..19608e86736 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/executor.hpp @@ -2,7 +2,7 @@ // impl/executor.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -39,15 +39,10 @@ public: template <typename F, typename Alloc> explicit function(F f, const Alloc& a) { - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Alloc>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Alloc>::get(a)); - // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<F, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - op_ = new (p.v) op(f, allocator); + typedef detail::executor_op<F, Alloc> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + op_ = new (p.v) op(ASIO_MOVE_CAST(F)(f), a); p.v = 0; } diff --git a/src/third_party/asio-master/asio/include/asio/impl/executor.ipp b/src/third_party/asio-master/asio/include/asio/impl/executor.ipp index 605333e4879..905c6e043cc 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/executor.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/executor.ipp @@ -2,7 +2,7 @@ // impl/executor.ipp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/handler_alloc_hook.ipp b/src/third_party/asio-master/asio/include/asio/impl/handler_alloc_hook.ipp index f4bcdf90b13..41a22a1a7c3 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/handler_alloc_hook.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/handler_alloc_hook.ipp @@ -2,7 +2,7 @@ // impl/handler_alloc_hook.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/io_context.hpp b/src/third_party/asio-master/asio/include/asio/impl/io_context.hpp index 45805ae6262..e0e50dfa0ed 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/io_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/io_context.hpp @@ -2,7 +2,7 @@ // impl/io_context.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -226,27 +226,23 @@ template <typename Function, typename Allocator> void io_context::executor_type::dispatch( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); // Invoke immediately if we are already inside the thread pool. if (io_context_.impl_.can_dispatch()) { + // Make a local, non-const copy of the function. + function_type tmp(ASIO_MOVE_CAST(Function)(f)); + detail::fenced_block b(detail::fenced_block::full); asio_handler_invoke_helpers::invoke(tmp, tmp); return; } - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); - // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type, detail::operation> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator, detail::operation> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((this->context(), *p.p, "io_context", &this->context(), 0, "post")); @@ -259,19 +255,12 @@ template <typename Function, typename Allocator> void io_context::executor_type::post( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type, detail::operation> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator, detail::operation> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((this->context(), *p.p, "io_context", &this->context(), 0, "post")); @@ -284,19 +273,12 @@ template <typename Function, typename Allocator> void io_context::executor_type::defer( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type, detail::operation> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator, detail::operation> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((this->context(), *p.p, "io_context", &this->context(), 0, "defer")); diff --git a/src/third_party/asio-master/asio/include/asio/impl/io_context.ipp b/src/third_party/asio-master/asio/include/asio/impl/io_context.ipp index b78ec1e81bb..7c64283318e 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/io_context.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/io_context.ipp @@ -2,7 +2,7 @@ // impl/io_context.ipp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/post.hpp b/src/third_party/asio-master/asio/include/asio/impl/post.hpp index 293b3873bd4..2be3d72e209 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/post.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/post.hpp @@ -2,7 +2,7 @@ // impl/post.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -52,12 +52,10 @@ ASIO_INITFN_RESULT_TYPE(CompletionToken, void()) post( async_completion<CompletionToken, void()> init(token); - Executor ex1(ex); - typename associated_allocator<handler>::type alloc( (get_associated_allocator)(init.completion_handler)); - ex1.post(detail::work_dispatcher<handler>(init.completion_handler), alloc); + ex.post(detail::work_dispatcher<handler>(init.completion_handler), alloc); return init.result.get(); } diff --git a/src/third_party/asio-master/asio/include/asio/impl/read.hpp b/src/third_party/asio-master/asio/include/asio/impl/read.hpp index 385a552ed8e..f7a8e287163 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/read.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/read.hpp @@ -2,7 +2,7 @@ // impl/read.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/read_at.hpp b/src/third_party/asio-master/asio/include/asio/impl/read_at.hpp index 273312f139f..019fd421ec4 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/read_at.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/read_at.hpp @@ -2,7 +2,7 @@ // impl/read_at.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/read_until.hpp b/src/third_party/asio-master/asio/include/asio/impl/read_until.hpp index c0a435e63b8..6401bd18517 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/read_until.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/read_until.hpp @@ -2,7 +2,7 @@ // impl/read_until.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.hpp b/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.hpp index c118d93cb9e..fe7c5e2bc67 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.hpp @@ -2,7 +2,7 @@ // impl/serial_port_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.ipp b/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.ipp index 748c8ca0d1a..0ebba098fc7 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/serial_port_base.ipp @@ -2,7 +2,7 @@ // impl/serial_port_base.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/impl/spawn.hpp b/src/third_party/asio-master/asio/include/asio/impl/spawn.hpp index 82a05f086a2..3f23ed371bb 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/spawn.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/spawn.hpp @@ -2,7 +2,7 @@ // impl/spawn.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/src.cpp b/src/third_party/asio-master/asio/include/asio/impl/src.cpp index fe56a795149..d0c7595c23a 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/src.cpp +++ b/src/third_party/asio-master/asio/include/asio/impl/src.cpp @@ -2,7 +2,7 @@ // impl/src.cpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/src.hpp b/src/third_party/asio-master/asio/include/asio/impl/src.hpp index a22b1fb5311..41a1d75338b 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/src.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/src.hpp @@ -2,7 +2,7 @@ // impl/src.hpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -26,7 +26,7 @@ #include "asio/impl/handler_alloc_hook.ipp" #include "asio/impl/io_context.ipp" #include "asio/impl/serial_port_base.ipp" -#include "asio/impl/system_executor.ipp" +#include "asio/impl/system_context.ipp" #include "asio/impl/thread_pool.ipp" #include "asio/detail/impl/buffer_sequence_adapter.ipp" #include "asio/detail/impl/descriptor_ops.ipp" diff --git a/src/third_party/asio-master/asio/include/asio/impl/system_executor.ipp b/src/third_party/asio-master/asio/include/asio/impl/system_context.ipp index 6e5b16e73b7..21e657837df 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/system_executor.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/system_context.ipp @@ -1,28 +1,28 @@ // -// impl/system_executor.ipp -// ~~~~~~~~~~~~~~~~~~~~ +// impl/system_context.ipp +// ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) // -#ifndef ASIO_IMPL_SYSTEM_EXECUTOR_IPP -#define ASIO_IMPL_SYSTEM_EXECUTOR_IPP +#ifndef ASIO_IMPL_SYSTEM_CONTEXT_IPP +#define ASIO_IMPL_SYSTEM_CONTEXT_IPP #if defined(_MSC_VER) && (_MSC_VER >= 1200) # pragma once #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include "asio/detail/config.hpp" -#include "asio/system_executor.hpp" +#include "asio/system_context.hpp" #include "asio/detail/push_options.hpp" namespace asio { -struct system_executor::thread_function +struct system_context::thread_function { detail::scheduler* scheduler_; @@ -33,7 +33,7 @@ struct system_executor::thread_function } }; -system_executor::context_impl::context_impl() +system_context::system_context() : scheduler_(use_service<detail::scheduler>(*this)) { scheduler_.work_started(); @@ -43,15 +43,31 @@ system_executor::context_impl::context_impl() threads_.create_threads(f, num_threads ? num_threads : 2); } -system_executor::context_impl::~context_impl() +system_context::~system_context() { scheduler_.work_finished(); scheduler_.stop(); threads_.join(); } +void system_context::stop() +{ + scheduler_.stop(); +} + +bool system_context::stopped() const ASIO_NOEXCEPT +{ + return scheduler_.stopped(); +} + +void system_context::join() +{ + scheduler_.work_finished(); + threads_.join(); +} + } // namespace asio #include "asio/detail/pop_options.hpp" -#endif // ASIO_IMPL_SYSTEM_EXECUTOR_IPP +#endif // ASIO_IMPL_SYSTEM_CONTEXT_IPP diff --git a/src/third_party/asio-master/asio/include/asio/impl/system_executor.hpp b/src/third_party/asio-master/asio/include/asio/impl/system_executor.hpp index 12ca9b958d4..af90dc41c5a 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/system_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/system_executor.hpp @@ -2,7 +2,7 @@ // impl/system_executor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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,15 +19,15 @@ #include "asio/detail/global.hpp" #include "asio/detail/recycling_allocator.hpp" #include "asio/detail/type_traits.hpp" -#include "asio/execution_context.hpp" +#include "asio/system_context.hpp" #include "asio/detail/push_options.hpp" namespace asio { -inline execution_context& system_executor::context() const ASIO_NOEXCEPT +inline system_context& system_executor::context() const ASIO_NOEXCEPT { - return detail::global<context_impl>(); + return detail::global<system_context>(); } template <typename Function, typename Allocator> @@ -42,21 +42,14 @@ template <typename Function, typename Allocator> void system_executor::post( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - context_impl& ctx = detail::global<context_impl>(); - - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); + system_context& ctx = detail::global<system_context>(); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((ctx, *p.p, "system_executor", &this->context(), 0, "post")); @@ -69,21 +62,14 @@ template <typename Function, typename Allocator> void system_executor::defer( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - context_impl& ctx = detail::global<context_impl>(); - - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); + system_context& ctx = detail::global<system_context>(); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((ctx, *p.p, "system_executor", &this->context(), 0, "defer")); diff --git a/src/third_party/asio-master/asio/include/asio/impl/thread_pool.hpp b/src/third_party/asio-master/asio/include/asio/impl/thread_pool.hpp index db7d5c01e36..5e069ee1827 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/thread_pool.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/thread_pool.hpp @@ -2,7 +2,7 @@ // impl/thread_pool.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -53,27 +53,23 @@ template <typename Function, typename Allocator> void thread_pool::executor_type::dispatch( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); // Invoke immediately if we are already inside the thread pool. if (pool_.scheduler_.can_dispatch()) { + // Make a local, non-const copy of the function. + function_type tmp(ASIO_MOVE_CAST(Function)(f)); + detail::fenced_block b(detail::fenced_block::full); asio_handler_invoke_helpers::invoke(tmp, tmp); return; } - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); - // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((pool_, *p.p, "thread_pool", &this->context(), 0, "dispatch")); @@ -86,19 +82,12 @@ template <typename Function, typename Allocator> void thread_pool::executor_type::post( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((pool_, *p.p, "thread_pool", &this->context(), 0, "post")); @@ -111,19 +100,12 @@ template <typename Function, typename Allocator> void thread_pool::executor_type::defer( ASIO_MOVE_ARG(Function) f, const Allocator& a) const { - // Make a local, non-const copy of the function. typedef typename decay<Function>::type function_type; - function_type tmp(ASIO_MOVE_CAST(Function)(f)); - - // Construct an allocator to be used for the operation. - typedef typename detail::get_recycling_allocator<Allocator>::type alloc_type; - alloc_type allocator(detail::get_recycling_allocator<Allocator>::get(a)); // Allocate and construct an operation to wrap the function. - typedef detail::executor_op<function_type, alloc_type> op; - typename op::ptr p = { allocator, 0, 0 }; - p.v = p.a.allocate(1); - p.p = new (p.v) op(tmp, allocator); + typedef detail::executor_op<function_type, Allocator> op; + typename op::ptr p = { detail::addressof(a), op::ptr::allocate(a), 0 }; + p.p = new (p.v) op(ASIO_MOVE_CAST(Function)(f), a); ASIO_HANDLER_CREATION((pool_, *p.p, "thread_pool", &this->context(), 0, "defer")); diff --git a/src/third_party/asio-master/asio/include/asio/impl/thread_pool.ipp b/src/third_party/asio-master/asio/include/asio/impl/thread_pool.ipp index f56b94acb40..373b01ce666 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/thread_pool.ipp +++ b/src/third_party/asio-master/asio/include/asio/impl/thread_pool.ipp @@ -2,7 +2,7 @@ // impl/thread_pool.ipp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/use_future.hpp b/src/third_party/asio-master/asio/include/asio/impl/use_future.hpp index 94e8af7f6cd..b743166543f 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/use_future.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/use_future.hpp @@ -2,7 +2,7 @@ // impl/use_future.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -174,7 +174,7 @@ class promise_invoker public: promise_invoker(const shared_ptr<std::promise<T> >& p, ASIO_MOVE_ARG(F) f) - : p_(p), f_(f) + : p_(p), f_(ASIO_MOVE_CAST(F)(f)) { } diff --git a/src/third_party/asio-master/asio/include/asio/impl/write.hpp b/src/third_party/asio-master/asio/include/asio/impl/write.hpp index 8250aa30361..7e0b15e1846 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/write.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/write.hpp @@ -2,7 +2,7 @@ // impl/write.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/impl/write_at.hpp b/src/third_party/asio-master/asio/include/asio/impl/write_at.hpp index 9e06bd28861..b79fe241171 100644 --- a/src/third_party/asio-master/asio/include/asio/impl/write_at.hpp +++ b/src/third_party/asio-master/asio/include/asio/impl/write_at.hpp @@ -2,7 +2,7 @@ // impl/write_at.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/io_context.hpp b/src/third_party/asio-master/asio/include/asio/io_context.hpp index 44fe432c76c..73212f197b5 100644 --- a/src/third_party/asio-master/asio/include/asio/io_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/io_context.hpp @@ -2,7 +2,7 @@ // io_context.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -64,12 +64,12 @@ namespace detail { * * @par Thread Safety * @e Distinct @e objects: Safe.@n - * @e Shared @e objects: Safe, with the specific exceptions of the restart() and - * notify_fork() functions. Calling restart() while there are unfinished run(), - * run_one(), poll() or poll_one() calls results in undefined behaviour. The - * notify_fork() function should not be called while any io_context function, - * or any function on an I/O object that is associated with the io_context, is - * being called in another thread. + * @e Shared @e objects: Safe, with the specific exceptions of the restart() + * and notify_fork() functions. Calling restart() while there are unfinished + * run(), run_one(), run_for(), run_until(), poll() or poll_one() calls results + * in undefined behaviour. The notify_fork() function should not be called + * while any io_context function, or any function on an I/O object that is + * associated with the io_context, is being called in another thread. * * @par Concepts: * Dispatcher. @@ -78,25 +78,26 @@ namespace detail { * * Synchronous operations on I/O objects implicitly run the io_context object * for an individual operation. The io_context functions run(), run_one(), - * poll() or poll_one() must be called for the io_context to perform - * asynchronous operations on behalf of a C++ program. Notification that an - * asynchronous operation has completed is delivered by invocation of the - * associated handler. Handlers are invoked only by a thread that is currently - * calling any overload of run(), run_one(), poll() or poll_one() for the - * io_context. + * run_for(), run_until(), poll() or poll_one() must be called for the + * io_context to perform asynchronous operations on behalf of a C++ program. + * Notification that an asynchronous operation has completed is delivered by + * invocation of the associated handler. Handlers are invoked only by a thread + * that is currently calling any overload of run(), run_one(), run_for(), + * run_until(), poll() or poll_one() for the io_context. * * @par Effect of exceptions thrown from handlers * * If an exception is thrown from a handler, the exception is allowed to * propagate through the throwing thread's invocation of run(), run_one(), - * poll() or poll_one(). No other threads that are calling any of these - * functions are affected. It is then the responsibility of the application to - * catch the exception. + * run_for(), run_until(), poll() or poll_one(). No other threads that are + * calling any of these functions are affected. It is then the responsibility + * of the application to catch the exception. * - * After the exception has been caught, the run(), run_one(), poll() or - * poll_one() call may be restarted @em without the need for an intervening - * call to restart(). This allows the thread to rejoin the io_context object's - * thread pool without impacting any other threads in the pool. + * After the exception has been caught, the run(), run_one(), run_for(), + * run_until(), poll() or poll_one() call may be restarted @em without the need + * for an intervening call to restart(). This allows the thread to rejoin the + * io_context object's thread pool without impacting any other threads in the + * pool. * * For example: * @@ -238,9 +239,10 @@ public: * * @return The number of handlers that were executed. * - * @note The run() function must not be called from a thread that is currently - * calling one of run(), run_one(), poll() or poll_one() on the same - * io_context object. + * @note Calling the run() function from a thread that is currently calling + * one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on + * the same io_context object may introduce the potential for deadlock. It is + * the caller's reponsibility to avoid this. * * The poll() function may also be used to dispatch ready handlers, but * without blocking. @@ -268,9 +270,10 @@ public: * * @return The number of handlers that were executed. * - * @note The run() function must not be called from a thread that is currently - * calling one of run(), run_one(), poll() or poll_one() on the same - * io_context object. + * @note Calling the run() function from a thread that is currently calling + * one of run(), run_one(), run_for(), run_until(), poll() or poll_one() on + * the same io_context object may introduce the potential for deadlock. It is + * the caller's reponsibility to avoid this. * * The poll() function may also be used to dispatch ready handlers, but * without blocking. @@ -318,6 +321,11 @@ public: * returns @c true). Subsequent calls to run(), run_one(), poll() or * poll_one() will return immediately unless there is a prior call to * restart(). + * + * @note Calling the run_one() function from a thread that is currently + * calling one of run(), run_one(), run_for(), run_until(), poll() or + * poll_one() on the same io_context object may introduce the potential for + * deadlock. It is the caller's reponsibility to avoid this. */ ASIO_DECL count_type run_one(); @@ -335,6 +343,11 @@ public: * restart(). * * @return The number of handlers that were executed. + * + * @note Calling the run_one() function from a thread that is currently + * calling one of run(), run_one(), run_for(), run_until(), poll() or + * poll_one() on the same io_context object may introduce the potential for + * deadlock. It is the caller's reponsibility to avoid this. */ ASIO_DECL count_type run_one(asio::error_code& ec); #endif // !defined(ASIO_NO_DEPRECATED) diff --git a/src/third_party/asio-master/asio/include/asio/io_context_strand.hpp b/src/third_party/asio-master/asio/include/asio/io_context_strand.hpp index 53a6c4690c2..052990bbf32 100644 --- a/src/third_party/asio-master/asio/include/asio/io_context_strand.hpp +++ b/src/third_party/asio-master/asio/include/asio/io_context_strand.hpp @@ -2,7 +2,7 @@ // io_context_strand.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -144,7 +144,7 @@ public: #endif // !defined(ASIO_NO_DEPRECATED) /// Obtain the underlying execution context. - asio::io_context& context() ASIO_NOEXCEPT + asio::io_context& context() const ASIO_NOEXCEPT { return service_.get_io_context(); } @@ -153,7 +153,7 @@ public: /** * The strand delegates this call to its underlying io_context. */ - void on_work_started() ASIO_NOEXCEPT + void on_work_started() const ASIO_NOEXCEPT { context().get_executor().on_work_started(); } @@ -162,7 +162,7 @@ public: /** * The strand delegates this call to its underlying io_context. */ - void on_work_finished() ASIO_NOEXCEPT + void on_work_finished() const ASIO_NOEXCEPT { context().get_executor().on_work_finished(); } @@ -183,7 +183,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void dispatch(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void dispatch(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { typename decay<Function>::type tmp(ASIO_MOVE_CAST(Function)(f)); service_.dispatch(impl_, tmp); @@ -241,7 +241,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void post(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void post(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { typename decay<Function>::type tmp(ASIO_MOVE_CAST(Function)(f)); service_.post(impl_, tmp); @@ -295,7 +295,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void defer(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void defer(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { typename decay<Function>::type tmp(ASIO_MOVE_CAST(Function)(f)); service_.post(impl_, tmp); @@ -370,7 +370,7 @@ public: private: asio::detail::strand_service& service_; - asio::detail::strand_service::implementation_type impl_; + mutable asio::detail::strand_service::implementation_type impl_; }; } // namespace asio diff --git a/src/third_party/asio-master/asio/include/asio/io_service.hpp b/src/third_party/asio-master/asio/include/asio/io_service.hpp index 73772a0fbcf..9f0d838193f 100644 --- a/src/third_party/asio-master/asio/include/asio/io_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/io_service.hpp @@ -2,7 +2,7 @@ // io_service.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/io_service_strand.hpp b/src/third_party/asio-master/asio/include/asio/io_service_strand.hpp index 49f6f3b244d..92f275e8943 100644 --- a/src/third_party/asio-master/asio/include/asio/io_service_strand.hpp +++ b/src/third_party/asio-master/asio/include/asio/io_service_strand.hpp @@ -2,7 +2,7 @@ // io_service_strand.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address.hpp b/src/third_party/asio-master/asio/include/asio/ip/address.hpp index 351a815cfcd..ca3fdeaf696 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address.hpp @@ -2,7 +2,7 @@ // ip/address.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v4.hpp index 6e16313d6e9..f30abd6b771 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v4.hpp @@ -2,7 +2,7 @@ // ip/address_v4.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v4_iterator.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v4_iterator.hpp index ad0889c9385..34e99bbf012 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v4_iterator.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v4_iterator.hpp @@ -2,7 +2,7 @@ // ip/address_v4_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v4_range.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v4_range.hpp index 06f3bd1818a..9aa2497567c 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v4_range.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v4_range.hpp @@ -2,7 +2,7 @@ // ip/address_v4_range.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v6.hpp index 663601d4c4d..77038dae859 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v6.hpp @@ -2,7 +2,7 @@ // ip/address_v6.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v6_iterator.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v6_iterator.hpp index 947af07b028..620f0ad6f5a 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v6_iterator.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v6_iterator.hpp @@ -2,7 +2,7 @@ // ip/address_v6_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/ip/address_v6_range.hpp b/src/third_party/asio-master/asio/include/asio/ip/address_v6_range.hpp index 4dc7a30e06c..afb062412be 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/address_v6_range.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/address_v6_range.hpp @@ -2,7 +2,7 @@ // ip/address_v6_range.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/ip/bad_address_cast.hpp b/src/third_party/asio-master/asio/include/asio/ip/bad_address_cast.hpp index 6c479146595..e3c89910daf 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/bad_address_cast.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/bad_address_cast.hpp @@ -2,7 +2,7 @@ // ip/bad_address_cast.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_endpoint.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_endpoint.hpp index d48f6441a6e..fc0a723a4b9 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_endpoint.hpp @@ -2,7 +2,7 @@ // ip/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver.hpp index 3aa61fb8dac..7c28c61d1df 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_entry.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_entry.hpp index ce689aa7480..268551bc7cd 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_entry.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_entry.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver_entry.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_iterator.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_iterator.hpp index 8cab75d1d63..85272e62a4d 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_iterator.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_iterator.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver_iterator.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_query.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_query.hpp index 9bde9fea228..269bc959748 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_query.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_query.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver_query.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_results.hpp b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_results.hpp index dec2c7e955a..4146a46b91a 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_results.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/basic_resolver_results.hpp @@ -2,7 +2,7 @@ // ip/basic_resolver_results.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/detail/endpoint.hpp b/src/third_party/asio-master/asio/include/asio/ip/detail/endpoint.hpp index 82875a4440c..7b90590d6e7 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/detail/endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/detail/endpoint.hpp @@ -2,7 +2,7 @@ // ip/detail/endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/detail/impl/endpoint.ipp b/src/third_party/asio-master/asio/include/asio/ip/detail/impl/endpoint.ipp index 1c8a93b5de0..dd3403e6ce8 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/detail/impl/endpoint.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/detail/impl/endpoint.ipp @@ -2,7 +2,7 @@ // ip/detail/impl/endpoint.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/detail/socket_option.hpp b/src/third_party/asio-master/asio/include/asio/ip/detail/socket_option.hpp index d555a408965..636d96758dd 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/detail/socket_option.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/detail/socket_option.hpp @@ -2,7 +2,7 @@ // detail/socket_option.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/host_name.hpp b/src/third_party/asio-master/asio/include/asio/ip/host_name.hpp index 6e556c62bd2..df94006d8b8 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/host_name.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/host_name.hpp @@ -2,7 +2,7 @@ // ip/host_name.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/icmp.hpp b/src/third_party/asio-master/asio/include/asio/ip/icmp.hpp index 752a82c809c..bf29c069918 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/icmp.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/icmp.hpp @@ -2,7 +2,7 @@ // ip/icmp.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp index c64fb023723..6e2eee7bcac 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp @@ -2,7 +2,7 @@ // ip/impl/address.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp index c558d9a0a4f..f63b6264a80 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp @@ -2,7 +2,7 @@ // ip/impl/address.ipp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp index 1897fd2675f..91532133b27 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp index 09439eb16c2..9afdc303147 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp index 407d9c1802e..d9ada719cee 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp index 79025aed7d4..1bfa71bf72c 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp index c1a29a8a4eb..3c283ae55e4 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp @@ -2,7 +2,7 @@ // ip/impl/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp index a1f8a0d331f..47a3f5f4b9e 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp @@ -2,7 +2,7 @@ // ip/impl/host_name.ipp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp index 34c03fdd378..857eeee2d11 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp index ec39aae1c04..52eecdafcd9 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -178,8 +178,11 @@ network_v4 make_network_v4(const std::string& str, return network_v4(); } - return network_v4(make_address_v4(str.substr(0, pos)), - std::atoi(str.substr(pos + 1).c_str())); + const address_v4 addr = make_address_v4(str.substr(0, pos), ec); + if (ec) + return network_v4(); + + return network_v4(addr, std::atoi(str.substr(pos + 1).c_str())); } #if defined(ASIO_HAS_STD_STRING_VIEW) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp index 03b9ed899eb..df4dccb6797 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp index c2418e3e955..c4845c31a93 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -147,8 +147,11 @@ network_v6 make_network_v6(const std::string& str, return network_v6(); } - return network_v6(make_address_v6(str.substr(0, pos)), - std::atoi(str.substr(pos + 1).c_str())); + const address_v6 addr = make_address_v6(str.substr(0, pos), ec); + if (ec) + return network_v6(); + + return network_v6(addr, std::atoi(str.substr(pos + 1).c_str())); } #if defined(ASIO_HAS_STD_STRING_VIEW) diff --git a/src/third_party/asio-master/asio/include/asio/ip/multicast.hpp b/src/third_party/asio-master/asio/include/asio/ip/multicast.hpp index 16fbf4cd7e8..7beddea95d9 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/multicast.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/multicast.hpp @@ -2,7 +2,7 @@ // ip/multicast.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/network_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/network_v4.hpp index 5980b8e510e..ed9048c40e2 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/network_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/network_v4.hpp @@ -2,7 +2,7 @@ // ip/network_v4.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/ip/network_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/network_v6.hpp index 4e07dbbc71d..3a7b55f1f07 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/network_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/network_v6.hpp @@ -2,7 +2,7 @@ // ip/network_v6.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/ip/resolver_base.hpp b/src/third_party/asio-master/asio/include/asio/ip/resolver_base.hpp index a8a94d5a2cc..2ed78990520 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/resolver_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/resolver_base.hpp @@ -2,7 +2,7 @@ // ip/resolver_base.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/resolver_query_base.hpp b/src/third_party/asio-master/asio/include/asio/ip/resolver_query_base.hpp index 297c9c93f2c..809edbd76f3 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/resolver_query_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/resolver_query_base.hpp @@ -2,7 +2,7 @@ // ip/resolver_query_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/resolver_service.hpp b/src/third_party/asio-master/asio/include/asio/ip/resolver_service.hpp index 18e2dc193dc..2e4cfd9b094 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/resolver_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/resolver_service.hpp @@ -2,7 +2,7 @@ // ip/resolver_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/tcp.hpp b/src/third_party/asio-master/asio/include/asio/ip/tcp.hpp index 40e5470ad0f..aaa2cc4b61b 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/tcp.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/tcp.hpp @@ -2,7 +2,7 @@ // ip/tcp.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/udp.hpp b/src/third_party/asio-master/asio/include/asio/ip/udp.hpp index a011accaff2..74070995ce8 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/udp.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/udp.hpp @@ -2,7 +2,7 @@ // ip/udp.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/unicast.hpp b/src/third_party/asio-master/asio/include/asio/ip/unicast.hpp index 8b768c2336f..86444e0b09c 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/unicast.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/unicast.hpp @@ -2,7 +2,7 @@ // ip/unicast.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ip/v6_only.hpp b/src/third_party/asio-master/asio/include/asio/ip/v6_only.hpp index 9106b25b6cd..dff26cbfbee 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/v6_only.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/v6_only.hpp @@ -2,7 +2,7 @@ // ip/v6_only.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/is_executor.hpp b/src/third_party/asio-master/asio/include/asio/is_executor.hpp index d5abf7b70c4..fd851c946d6 100644 --- a/src/third_party/asio-master/asio/include/asio/is_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/is_executor.hpp @@ -2,7 +2,7 @@ // is_executor.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/is_read_buffered.hpp b/src/third_party/asio-master/asio/include/asio/is_read_buffered.hpp index 10483b17b79..936c44adebd 100644 --- a/src/third_party/asio-master/asio/include/asio/is_read_buffered.hpp +++ b/src/third_party/asio-master/asio/include/asio/is_read_buffered.hpp @@ -2,7 +2,7 @@ // is_read_buffered.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/is_write_buffered.hpp b/src/third_party/asio-master/asio/include/asio/is_write_buffered.hpp index b0efbbb6841..8075e801cf4 100644 --- a/src/third_party/asio-master/asio/include/asio/is_write_buffered.hpp +++ b/src/third_party/asio-master/asio/include/asio/is_write_buffered.hpp @@ -2,7 +2,7 @@ // is_write_buffered.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/local/basic_endpoint.hpp b/src/third_party/asio-master/asio/include/asio/local/basic_endpoint.hpp index ae30100728a..421e2524f3b 100644 --- a/src/third_party/asio-master/asio/include/asio/local/basic_endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/local/basic_endpoint.hpp @@ -2,7 +2,7 @@ // local/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Derived from a public domain implementation written by Daniel Casimiro. // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/local/connect_pair.hpp b/src/third_party/asio-master/asio/include/asio/local/connect_pair.hpp index 3542d9b05ae..ba584df5c94 100644 --- a/src/third_party/asio-master/asio/include/asio/local/connect_pair.hpp +++ b/src/third_party/asio-master/asio/include/asio/local/connect_pair.hpp @@ -2,7 +2,7 @@ // local/connect_pair.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/local/datagram_protocol.hpp b/src/third_party/asio-master/asio/include/asio/local/datagram_protocol.hpp index 17773d77aae..b1cd84fc104 100644 --- a/src/third_party/asio-master/asio/include/asio/local/datagram_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/local/datagram_protocol.hpp @@ -2,7 +2,7 @@ // local/datagram_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/local/detail/endpoint.hpp b/src/third_party/asio-master/asio/include/asio/local/detail/endpoint.hpp index 6125e972571..7e7e4a5647b 100644 --- a/src/third_party/asio-master/asio/include/asio/local/detail/endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/local/detail/endpoint.hpp @@ -2,7 +2,7 @@ // local/detail/endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Derived from a public domain implementation written by Daniel Casimiro. // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/local/detail/impl/endpoint.ipp b/src/third_party/asio-master/asio/include/asio/local/detail/impl/endpoint.ipp index adda630f81e..5b06a5e8241 100644 --- a/src/third_party/asio-master/asio/include/asio/local/detail/impl/endpoint.ipp +++ b/src/third_party/asio-master/asio/include/asio/local/detail/impl/endpoint.ipp @@ -2,7 +2,7 @@ // local/detail/impl/endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Derived from a public domain implementation written by Daniel Casimiro. // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/local/stream_protocol.hpp b/src/third_party/asio-master/asio/include/asio/local/stream_protocol.hpp index e8094ccb9a1..7a9a0a8d62d 100644 --- a/src/third_party/asio-master/asio/include/asio/local/stream_protocol.hpp +++ b/src/third_party/asio-master/asio/include/asio/local/stream_protocol.hpp @@ -2,7 +2,7 @@ // local/stream_protocol.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/packaged_task.hpp b/src/third_party/asio-master/asio/include/asio/packaged_task.hpp index af8d6896642..8b19bc1fed0 100644 --- a/src/third_party/asio-master/asio/include/asio/packaged_task.hpp +++ b/src/third_party/asio-master/asio/include/asio/packaged_task.hpp @@ -2,7 +2,7 @@ // packaged_task.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/placeholders.hpp b/src/third_party/asio-master/asio/include/asio/placeholders.hpp index 8e6e2e5c6c2..efa4315e30a 100644 --- a/src/third_party/asio-master/asio/include/asio/placeholders.hpp +++ b/src/third_party/asio-master/asio/include/asio/placeholders.hpp @@ -2,7 +2,7 @@ // placeholders.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/basic_descriptor.hpp b/src/third_party/asio-master/asio/include/asio/posix/basic_descriptor.hpp index 27db872c338..1759388a5a0 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/basic_descriptor.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/basic_descriptor.hpp @@ -2,7 +2,7 @@ // posix/basic_descriptor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/basic_stream_descriptor.hpp b/src/third_party/asio-master/asio/include/asio/posix/basic_stream_descriptor.hpp index eb7bc8bb975..d6e3418e34c 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/basic_stream_descriptor.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/basic_stream_descriptor.hpp @@ -2,7 +2,7 @@ // posix/basic_stream_descriptor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/descriptor.hpp b/src/third_party/asio-master/asio/include/asio/posix/descriptor.hpp index 9ab46a5d956..81a4812bf94 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/descriptor.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/descriptor.hpp @@ -2,7 +2,7 @@ // posix/descriptor.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/descriptor_base.hpp b/src/third_party/asio-master/asio/include/asio/posix/descriptor_base.hpp index b77d49d8227..f84332dbb2f 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/descriptor_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/descriptor_base.hpp @@ -2,7 +2,7 @@ // posix/descriptor_base.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor.hpp b/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor.hpp index 29e157208c6..032f1b32b3d 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor.hpp @@ -2,7 +2,7 @@ // posix/stream_descriptor.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor_service.hpp b/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor_service.hpp index e7a1b32394c..5b38b9d657c 100644 --- a/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/posix/stream_descriptor_service.hpp @@ -2,7 +2,7 @@ // posix/stream_descriptor_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/post.hpp b/src/third_party/asio-master/asio/include/asio/post.hpp index 17625cb27f0..3a7cd0b83e0 100644 --- a/src/third_party/asio-master/asio/include/asio/post.hpp +++ b/src/third_party/asio-master/asio/include/asio/post.hpp @@ -2,7 +2,7 @@ // post.hpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/raw_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/raw_socket_service.hpp index 9882abb48cf..278dd2443d9 100644 --- a/src/third_party/asio-master/asio/include/asio/raw_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/raw_socket_service.hpp @@ -2,7 +2,7 @@ // raw_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/read.hpp b/src/third_party/asio-master/asio/include/asio/read.hpp index 4839934dbab..5cf981e79d8 100644 --- a/src/third_party/asio-master/asio/include/asio/read.hpp +++ b/src/third_party/asio-master/asio/include/asio/read.hpp @@ -2,7 +2,7 @@ // read.hpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/read_at.hpp b/src/third_party/asio-master/asio/include/asio/read_at.hpp index 16e6af1568c..a58c84de241 100644 --- a/src/third_party/asio-master/asio/include/asio/read_at.hpp +++ b/src/third_party/asio-master/asio/include/asio/read_at.hpp @@ -2,7 +2,7 @@ // read_at.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/read_until.hpp b/src/third_party/asio-master/asio/include/asio/read_until.hpp index 93bf96b38c7..764e408fd5f 100644 --- a/src/third_party/asio-master/asio/include/asio/read_until.hpp +++ b/src/third_party/asio-master/asio/include/asio/read_until.hpp @@ -2,7 +2,7 @@ // read_until.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/seq_packet_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/seq_packet_socket_service.hpp index fceb1d0c4b3..e4335d37a22 100644 --- a/src/third_party/asio-master/asio/include/asio/seq_packet_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/seq_packet_socket_service.hpp @@ -2,7 +2,7 @@ // seq_packet_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/serial_port.hpp b/src/third_party/asio-master/asio/include/asio/serial_port.hpp index 4455a0aa3b6..317d9f0f5f2 100644 --- a/src/third_party/asio-master/asio/include/asio/serial_port.hpp +++ b/src/third_party/asio-master/asio/include/asio/serial_port.hpp @@ -2,7 +2,7 @@ // serial_port.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/serial_port_base.hpp b/src/third_party/asio-master/asio/include/asio/serial_port_base.hpp index b4ab4f30df3..900be1eb0f4 100644 --- a/src/third_party/asio-master/asio/include/asio/serial_port_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/serial_port_base.hpp @@ -2,7 +2,7 @@ // serial_port_base.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2008 Rep Invariant Systems, Inc. (info@repinvariant.com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/serial_port_service.hpp b/src/third_party/asio-master/asio/include/asio/serial_port_service.hpp index 4f47e57602d..6237ea7a544 100644 --- a/src/third_party/asio-master/asio/include/asio/serial_port_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/serial_port_service.hpp @@ -2,7 +2,7 @@ // serial_port_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/signal_set.hpp b/src/third_party/asio-master/asio/include/asio/signal_set.hpp index 085090139f9..016b2940b06 100644 --- a/src/third_party/asio-master/asio/include/asio/signal_set.hpp +++ b/src/third_party/asio-master/asio/include/asio/signal_set.hpp @@ -2,7 +2,7 @@ // signal_set.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/signal_set_service.hpp b/src/third_party/asio-master/asio/include/asio/signal_set_service.hpp index d4c54b82771..3c6382d9d44 100644 --- a/src/third_party/asio-master/asio/include/asio/signal_set_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/signal_set_service.hpp @@ -2,7 +2,7 @@ // signal_set_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/socket_acceptor_service.hpp b/src/third_party/asio-master/asio/include/asio/socket_acceptor_service.hpp index 933340addf9..430ecaa200a 100644 --- a/src/third_party/asio-master/asio/include/asio/socket_acceptor_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/socket_acceptor_service.hpp @@ -2,7 +2,7 @@ // socket_acceptor_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/socket_base.hpp b/src/third_party/asio-master/asio/include/asio/socket_base.hpp index 99ef3779af0..aa78b55e04a 100644 --- a/src/third_party/asio-master/asio/include/asio/socket_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/socket_base.hpp @@ -2,7 +2,7 @@ // socket_base.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -432,6 +432,40 @@ public: linger; #endif + /// Socket option for putting received out-of-band data inline. + /** + * Implements the SOL_SOCKET/SO_OOBINLINE socket option. + * + * @par Examples + * Setting the option: + * @code + * asio::ip::tcp::socket socket(io_context); + * ... + * asio::socket_base::out_of_band_inline option(true); + * socket.set_option(option); + * @endcode + * + * @par + * Getting the current option value: + * @code + * asio::ip::tcp::socket socket(io_context); + * ... + * asio::socket_base::out_of_band_inline option; + * socket.get_option(option); + * bool value = option.value(); + * @endcode + * + * @par Concepts: + * Socket_Option, Boolean_Socket_Option. + */ +#if defined(GENERATING_DOCUMENTATION) + typedef implementation_defined out_of_band_inline; +#else + typedef asio::detail::socket_option::boolean< + ASIO_OS_DEF(SOL_SOCKET), ASIO_OS_DEF(SO_OOBINLINE)> + out_of_band_inline; +#endif + /// Socket option to report aborted connections on accept. /** * Implements a custom socket option that determines whether or not an accept diff --git a/src/third_party/asio-master/asio/include/asio/spawn.hpp b/src/third_party/asio-master/asio/include/asio/spawn.hpp index cffe4312e5d..d21733c944f 100644 --- a/src/third_party/asio-master/asio/include/asio/spawn.hpp +++ b/src/third_party/asio-master/asio/include/asio/spawn.hpp @@ -2,7 +2,7 @@ // spawn.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl.hpp b/src/third_party/asio-master/asio/include/asio/ssl.hpp index bc3dae03c9c..e49eb17e751 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl.hpp @@ -2,7 +2,7 @@ // ssl.hpp // ~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/context.hpp b/src/third_party/asio-master/asio/include/asio/ssl/context.hpp index e1b19d18f57..1af04990ea1 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/context.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/context.hpp @@ -2,7 +2,7 @@ // ssl/context.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/context_base.hpp b/src/third_party/asio-master/asio/include/asio/ssl/context_base.hpp index b3af107d513..1fea9799c2f 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/context_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/context_base.hpp @@ -2,7 +2,7 @@ // ssl/context_base.hpp // ~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -83,7 +83,16 @@ public: tlsv12_client, /// TLS version 1.2 server. - tlsv12_server + tlsv12_server, + + /// Generic TLS. + tls, + + /// TLS client. + tls_client, + + /// TLS server. + tls_server }; /// Bitmask type for SSL options. diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/buffered_handshake_op.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/buffered_handshake_op.hpp index e661bdef392..ceb22e86e87 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/buffered_handshake_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/buffered_handshake_op.hpp @@ -2,7 +2,7 @@ // ssl/detail/buffered_handshake_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/engine.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/engine.hpp index c9ea33b1bb9..061a50dd2ac 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/engine.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/engine.hpp @@ -2,7 +2,7 @@ // ssl/detail/engine.hpp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/handshake_op.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/handshake_op.hpp index b6848ea62e5..23824d88ba4 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/handshake_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/handshake_op.hpp @@ -2,7 +2,7 @@ // ssl/detail/handshake_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/engine.ipp b/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/engine.ipp index c25844c8313..d55bc87f59d 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/engine.ipp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/engine.ipp @@ -2,7 +2,7 @@ // ssl/detail/impl/engine.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/openssl_init.ipp b/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/openssl_init.ipp index 5de0caa6586..75aefec02fe 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/openssl_init.ipp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/impl/openssl_init.ipp @@ -3,7 +3,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com -// Copyright (c) 2005-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2005-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/io.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/io.hpp index 5d35ba45707..553f1fff9ab 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/io.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/io.hpp @@ -2,7 +2,7 @@ // ssl/detail/io.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_init.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_init.hpp index 6144534c989..623ee49a3e2 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_init.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_init.hpp @@ -2,7 +2,7 @@ // ssl/detail/openssl_init.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_types.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_types.hpp index 981fcb19fab..a5ef5bb84d8 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_types.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/openssl_types.hpp @@ -2,7 +2,7 @@ // ssl/detail/openssl_types.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/password_callback.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/password_callback.hpp index abff36c6f33..d43d7eeaff0 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/password_callback.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/password_callback.hpp @@ -2,7 +2,7 @@ // ssl/detail/password_callback.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/read_op.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/read_op.hpp index 2195bc892eb..bbb8505260f 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/read_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/read_op.hpp @@ -2,7 +2,7 @@ // ssl/detail/read_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/shutdown_op.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/shutdown_op.hpp index 974eaa0a423..fa06ede14c1 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/shutdown_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/shutdown_op.hpp @@ -2,7 +2,7 @@ // ssl/detail/shutdown_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/stream_core.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/stream_core.hpp index 1872912c018..86cbfc06656 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/stream_core.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/stream_core.hpp @@ -2,7 +2,7 @@ // ssl/detail/stream_core.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/verify_callback.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/verify_callback.hpp index 288ff66db48..9314aae195b 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/verify_callback.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/verify_callback.hpp @@ -2,7 +2,7 @@ // ssl/detail/verify_callback.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/detail/write_op.hpp b/src/third_party/asio-master/asio/include/asio/ssl/detail/write_op.hpp index d40719e0fa5..7f6f928a9a5 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/detail/write_op.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/detail/write_op.hpp @@ -2,7 +2,7 @@ // ssl/detail/write_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/error.hpp b/src/third_party/asio-master/asio/include/asio/ssl/error.hpp index 727b5ca17ae..6a0d2213e14 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/error.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/error.hpp @@ -2,7 +2,7 @@ // ssl/error.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/impl/context.hpp b/src/third_party/asio-master/asio/include/asio/ssl/impl/context.hpp index 2b5a1616bf9..95808e0f89b 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/impl/context.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/impl/context.hpp @@ -3,7 +3,7 @@ // ~~~~~~~~~~~~~~~~~~~~ // // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com -// Copyright (c) 2005-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2005-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/impl/context.ipp b/src/third_party/asio-master/asio/include/asio/ssl/impl/context.ipp index e80dc813d6a..45e203fb5d5 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/impl/context.ipp +++ b/src/third_party/asio-master/asio/include/asio/ssl/impl/context.ipp @@ -3,7 +3,7 @@ // ~~~~~~~~~~~~~~~~~~~~ // // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com -// Copyright (c) 2005-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2005-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -66,16 +66,15 @@ context::context(context::method m) switch (m) { -#if defined(OPENSSL_NO_SSL2) \ - || (OPENSSL_VERSION_NUMBER >= 0x10100000L) + // SSL v2. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2) case context::sslv2: case context::sslv2_client: case context::sslv2_server: asio::detail::throw_error( asio::error::invalid_argument, "context"); break; -#else // defined(OPENSSL_NO_SSL2) - // || (OPENSSL_VERSION_NUMBER >= 0x10100000L) +#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2) case context::sslv2: handle_ = ::SSL_CTX_new(::SSLv2_method()); break; @@ -85,9 +84,35 @@ context::context(context::method m) case context::sslv2_server: handle_ = ::SSL_CTX_new(::SSLv2_server_method()); break; -#endif // defined(OPENSSL_NO_SSL2) - // || (OPENSSL_VERSION_NUMBER >= 0x10100000L) -#if defined(OPENSSL_NO_SSL3) +#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2) + + // SSL v3. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + case context::sslv3: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, SSL3_VERSION); + SSL_CTX_set_max_proto_version(handle_, SSL3_VERSION); + } + break; + case context::sslv3_client: + handle_ = ::SSL_CTX_new(::TLS_client_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, SSL3_VERSION); + SSL_CTX_set_max_proto_version(handle_, SSL3_VERSION); + } + break; + case context::sslv3_server: + handle_ = ::SSL_CTX_new(::TLS_server_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, SSL3_VERSION); + SSL_CTX_set_max_proto_version(handle_, SSL3_VERSION); + } + break; +#elif defined(OPENSSL_NO_SSL3) case context::sslv3: case context::sslv3_client: case context::sslv3_server: @@ -105,7 +130,34 @@ context::context(context::method m) handle_ = ::SSL_CTX_new(::SSLv3_server_method()); break; #endif // defined(OPENSSL_NO_SSL3) -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) + + // TLS v1.0. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + case context::tlsv1: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_VERSION); + } + break; + case context::tlsv1_client: + handle_ = ::SSL_CTX_new(::TLS_client_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_VERSION); + } + break; + case context::tlsv1_server: + handle_ = ::SSL_CTX_new(::TLS_server_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_VERSION); + } + break; +#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) case context::tlsv1: handle_ = ::SSL_CTX_new(::TLSv1_method()); break; @@ -115,18 +167,35 @@ context::context(context::method m) case context::tlsv1_server: handle_ = ::SSL_CTX_new(::TLSv1_server_method()); break; -#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) - case context::sslv23: - handle_ = ::SSL_CTX_new(::SSLv23_method()); +#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) + + // TLS v1.1. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + case context::tlsv11: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_1_VERSION); + } break; - case context::sslv23_client: - handle_ = ::SSL_CTX_new(::SSLv23_client_method()); + case context::tlsv11_client: + handle_ = ::SSL_CTX_new(::TLS_client_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_1_VERSION); + } break; - case context::sslv23_server: - handle_ = ::SSL_CTX_new(::SSLv23_server_method()); + case context::tlsv11_server: + handle_ = ::SSL_CTX_new(::TLS_server_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_1_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_1_VERSION); + } break; -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) -#if defined(SSL_TXT_TLSV1_1) +#elif defined(SSL_TXT_TLSV1_1) case context::tlsv11: handle_ = ::SSL_CTX_new(::TLSv1_1_method()); break; @@ -144,7 +213,34 @@ context::context(context::method m) asio::error::invalid_argument, "context"); break; #endif // defined(SSL_TXT_TLSV1_1) -#if defined(SSL_TXT_TLSV1_2) + + // TLS v1.2. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + case context::tlsv12: + handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_2_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_2_VERSION); + } + break; + case context::tlsv12_client: + handle_ = ::SSL_CTX_new(::TLS_client_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_2_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_2_VERSION); + } + break; + case context::tlsv12_server: + handle_ = ::SSL_CTX_new(::TLS_server_method()); + if (handle_) + { + SSL_CTX_set_min_proto_version(handle_, TLS1_2_VERSION); + SSL_CTX_set_max_proto_version(handle_, TLS1_2_VERSION); + } + break; +#elif defined(SSL_TXT_TLSV1_1) case context::tlsv12: handle_ = ::SSL_CTX_new(::TLSv1_2_method()); break; @@ -154,31 +250,61 @@ context::context(context::method m) case context::tlsv12_server: handle_ = ::SSL_CTX_new(::TLSv1_2_server_method()); break; -#else // defined(SSL_TXT_TLSV1_2) +#else // defined(SSL_TXT_TLSV1_1) case context::tlsv12: case context::tlsv12_client: case context::tlsv12_server: asio::detail::throw_error( asio::error::invalid_argument, "context"); break; -#endif // defined(SSL_TXT_TLSV1_2) -#else // (OPENSSL_VERSION_NUMBER < 0x10100000L) - case context::tlsv1: - case context::tlsv11: - case context::tlsv12: +#endif // defined(SSL_TXT_TLSV1_1) + + // Any supported SSL/TLS version. + case context::sslv23: + handle_ = ::SSL_CTX_new(::SSLv23_method()); + break; + case context::sslv23_client: + handle_ = ::SSL_CTX_new(::SSLv23_client_method()); + break; + case context::sslv23_server: + handle_ = ::SSL_CTX_new(::SSLv23_server_method()); + break; + + // Any supported TLS version. +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + case context::tls: handle_ = ::SSL_CTX_new(::TLS_method()); + if (handle_) + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); break; - case context::tlsv1_client: - case context::tlsv11_client: - case context::tlsv12_client: + case context::tls_client: handle_ = ::SSL_CTX_new(::TLS_client_method()); + if (handle_) + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); break; - case context::tlsv1_server: - case context::tlsv11_server: - case context::tlsv12_server: + case context::tls_server: handle_ = ::SSL_CTX_new(::TLS_server_method()); + if (handle_) + SSL_CTX_set_min_proto_version(handle_, TLS1_VERSION); + break; +#else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) + case context::tls: + handle_ = ::SSL_CTX_new(::SSLv23_method()); + if (handle_) + SSL_CTX_set_options(handle_, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); break; -#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) + case context::tls_client: + handle_ = ::SSL_CTX_new(::SSLv23_client_method()); + if (handle_) + SSL_CTX_set_options(handle_, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + break; + case context::tls_server: + handle_ = ::SSL_CTX_new(::SSLv23_server_method()); + if (handle_) + SSL_CTX_set_options(handle_, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); + break; +#endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) + default: handle_ = ::SSL_CTX_new(0); break; @@ -215,7 +341,7 @@ context::~context() { if (handle_) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) void* cb_userdata = handle_->default_passwd_callback_userdata; @@ -226,7 +352,7 @@ context::~context() static_cast<detail::password_callback_base*>( cb_userdata); delete callback; -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) handle_->default_passwd_callback_userdata = 0; @@ -560,7 +686,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain( bio_cleanup bio = { make_buffer_bio(chain) }; if (bio.p) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) @@ -664,7 +790,7 @@ ASIO_SYNC_OP_VOID context::use_private_key( { ::ERR_clear_error(); -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) @@ -731,7 +857,7 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key( { ::ERR_clear_error(); -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) @@ -970,7 +1096,7 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx) ASIO_SYNC_OP_VOID context::do_set_password_callback( detail::password_callback_base* callback, asio::error_code& ec) { -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/impl/error.ipp b/src/third_party/asio-master/asio/include/asio/ssl/impl/error.ipp index 268fc9664cf..42caeb7aa4c 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/impl/error.ipp +++ b/src/third_party/asio-master/asio/include/asio/ssl/impl/error.ipp @@ -2,7 +2,7 @@ // ssl/impl/error.ipp // ~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/impl/rfc2818_verification.ipp b/src/third_party/asio-master/asio/include/asio/ssl/impl/rfc2818_verification.ipp index f84b02573ae..11eb36d960f 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/impl/rfc2818_verification.ipp +++ b/src/third_party/asio-master/asio/include/asio/ssl/impl/rfc2818_verification.ipp @@ -2,7 +2,7 @@ // ssl/impl/rfc2818_verification.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/impl/src.hpp b/src/third_party/asio-master/asio/include/asio/ssl/impl/src.hpp index e6e269f9998..39c85e34b2b 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/impl/src.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/impl/src.hpp @@ -2,7 +2,7 @@ // impl/ssl/src.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/rfc2818_verification.hpp b/src/third_party/asio-master/asio/include/asio/ssl/rfc2818_verification.hpp index a4ab67b2aee..4489c835fc0 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/rfc2818_verification.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/rfc2818_verification.hpp @@ -2,7 +2,7 @@ // ssl/rfc2818_verification.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/stream.hpp b/src/third_party/asio-master/asio/include/asio/ssl/stream.hpp index bc259b59ca7..0dbffe2777b 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/stream.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/stream.hpp @@ -2,7 +2,7 @@ // ssl/stream.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/stream_base.hpp b/src/third_party/asio-master/asio/include/asio/ssl/stream_base.hpp index 275d3e3821e..ca95c761d47 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/stream_base.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/stream_base.hpp @@ -2,7 +2,7 @@ // ssl/stream_base.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/verify_context.hpp b/src/third_party/asio-master/asio/include/asio/ssl/verify_context.hpp index 560ffcc7ad8..34f93531f9a 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/verify_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/verify_context.hpp @@ -2,7 +2,7 @@ // ssl/verify_context.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ssl/verify_mode.hpp b/src/third_party/asio-master/asio/include/asio/ssl/verify_mode.hpp index 7a2bd5654c7..6c444cc89da 100644 --- a/src/third_party/asio-master/asio/include/asio/ssl/verify_mode.hpp +++ b/src/third_party/asio-master/asio/include/asio/ssl/verify_mode.hpp @@ -2,7 +2,7 @@ // ssl/verify_mode.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/steady_timer.hpp b/src/third_party/asio-master/asio/include/asio/steady_timer.hpp index 746ac04a81b..2c73fa54157 100644 --- a/src/third_party/asio-master/asio/include/asio/steady_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/steady_timer.hpp @@ -2,7 +2,7 @@ // steady_timer.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/strand.hpp b/src/third_party/asio-master/asio/include/asio/strand.hpp index c70162ba387..b8ee0e66809 100644 --- a/src/third_party/asio-master/asio/include/asio/strand.hpp +++ b/src/third_party/asio-master/asio/include/asio/strand.hpp @@ -2,7 +2,7 @@ // strand.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -148,7 +148,7 @@ public: } /// Obtain the underlying execution context. - execution_context& context() ASIO_NOEXCEPT + execution_context& context() const ASIO_NOEXCEPT { return executor_.context(); } @@ -157,7 +157,7 @@ public: /** * The strand delegates this call to its underlying executor. */ - void on_work_started() ASIO_NOEXCEPT + void on_work_started() const ASIO_NOEXCEPT { executor_.on_work_started(); } @@ -166,7 +166,7 @@ public: /** * The strand delegates this call to its underlying executor. */ - void on_work_finished() ASIO_NOEXCEPT + void on_work_finished() const ASIO_NOEXCEPT { executor_.on_work_finished(); } @@ -187,7 +187,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void dispatch(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void dispatch(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { detail::strand_executor_service::dispatch(impl_, executor_, ASIO_MOVE_CAST(Function)(f), a); @@ -207,7 +207,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void post(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void post(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { detail::strand_executor_service::post(impl_, executor_, ASIO_MOVE_CAST(Function)(f), a); @@ -227,7 +227,7 @@ public: * internal storage needed for function invocation. */ template <typename Function, typename Allocator> - void defer(ASIO_MOVE_ARG(Function) f, const Allocator& a) + void defer(ASIO_MOVE_ARG(Function) f, const Allocator& a) const { detail::strand_executor_service::defer(impl_, executor_, ASIO_MOVE_CAST(Function)(f), a); diff --git a/src/third_party/asio-master/asio/include/asio/stream_socket_service.hpp b/src/third_party/asio-master/asio/include/asio/stream_socket_service.hpp index bffc1a16d82..9c0a3615df6 100644 --- a/src/third_party/asio-master/asio/include/asio/stream_socket_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/stream_socket_service.hpp @@ -2,7 +2,7 @@ // stream_socket_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/streambuf.hpp b/src/third_party/asio-master/asio/include/asio/streambuf.hpp index 8e613e9de91..d2268fa3e4d 100644 --- a/src/third_party/asio-master/asio/include/asio/streambuf.hpp +++ b/src/third_party/asio-master/asio/include/asio/streambuf.hpp @@ -2,7 +2,7 @@ // streambuf.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/system_context.hpp b/src/third_party/asio-master/asio/include/asio/system_context.hpp new file mode 100644 index 00000000000..6c833e2b18f --- /dev/null +++ b/src/third_party/asio-master/asio/include/asio/system_context.hpp @@ -0,0 +1,79 @@ +// +// system_context.hpp +// ~~~~~~~~~~~~~~~~~~ +// +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// +// 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) +// + +#ifndef ASIO_SYSTEM_CONTEXT_HPP +#define ASIO_SYSTEM_CONTEXT_HPP + +#if defined(_MSC_VER) && (_MSC_VER >= 1200) +# pragma once +#endif // defined(_MSC_VER) && (_MSC_VER >= 1200) + +#include "asio/detail/config.hpp" +#include "asio/detail/scheduler.hpp" +#include "asio/detail/thread_group.hpp" +#include "asio/execution_context.hpp" +#include "asio/system_executor.hpp" + +#include "asio/detail/push_options.hpp" + +namespace asio { + +/// The executor context for the system executor. +class system_context : public execution_context +{ +public: + /// The executor type associated with the context. + typedef system_executor executor_type; + + /// Destructor shuts down all threads in the system thread pool. + ASIO_DECL ~system_context(); + + /// Obtain an executor for the context. + executor_type get_executor() ASIO_NOEXCEPT + { + return system_executor(); + } + + /// Signal all threads in the system thread pool to stop. + ASIO_DECL void stop(); + + /// Determine whether the system thread pool has been stopped. + ASIO_DECL bool stopped() const ASIO_NOEXCEPT; + + /// Join all threads in the system thread pool. + ASIO_DECL void join(); + +#if defined(GENERATING_DOCUMENTATION) +private: +#endif // defined(GENERATING_DOCUMENTATION) + // Constructor creates all threads in the system thread pool. + ASIO_DECL system_context(); + +private: + friend class system_executor; + + struct thread_function; + + // The underlying scheduler. + detail::scheduler& scheduler_; + + // The threads in the system thread pool. + detail::thread_group threads_; +}; + +} // namespace asio + +#include "asio/detail/pop_options.hpp" + +#if defined(ASIO_HEADER_ONLY) +# include "asio/impl/system_context.ipp" +#endif // defined(ASIO_HEADER_ONLY) + +#endif // ASIO_SYSTEM_CONTEXT_HPP diff --git a/src/third_party/asio-master/asio/include/asio/system_error.hpp b/src/third_party/asio-master/asio/include/asio/system_error.hpp index 6c7a1e1424d..37a0b7a6403 100644 --- a/src/third_party/asio-master/asio/include/asio/system_error.hpp +++ b/src/third_party/asio-master/asio/include/asio/system_error.hpp @@ -2,7 +2,7 @@ // system_error.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/system_executor.hpp b/src/third_party/asio-master/asio/include/asio/system_executor.hpp index f23e35f04b6..3cf3703ee78 100644 --- a/src/third_party/asio-master/asio/include/asio/system_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/system_executor.hpp @@ -2,7 +2,7 @@ // system_executor.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -16,14 +16,13 @@ #endif // defined(_MSC_VER) && (_MSC_VER >= 1200) #include "asio/detail/config.hpp" -#include "asio/detail/scheduler.hpp" -#include "asio/detail/thread_group.hpp" -#include "asio/execution_context.hpp" #include "asio/detail/push_options.hpp" namespace asio { +class system_context; + /// An executor that uses arbitrary threads. /** * The system executor represents an execution context where functions are @@ -35,7 +34,7 @@ class system_executor { public: /// Obtain the underlying execution context. - execution_context& context() const ASIO_NOEXCEPT; + system_context& context() const ASIO_NOEXCEPT; /// Inform the executor that it has some outstanding work to do. /** @@ -119,26 +118,6 @@ public: { return false; } - -private: - struct thread_function; - - // Hidden implementation of the system execution context. - struct context_impl - : public execution_context - { - // Constructor creates all threads in the system thread pool. - ASIO_DECL context_impl(); - - // Destructor shuts down all threads in the system thread pool. - ASIO_DECL ~context_impl(); - - // The underlying scheduler. - detail::scheduler& scheduler_; - - // The threads in the system thread pool. - detail::thread_group threads_; - }; }; } // namespace asio @@ -146,8 +125,5 @@ private: #include "asio/detail/pop_options.hpp" #include "asio/impl/system_executor.hpp" -#if defined(ASIO_HEADER_ONLY) -# include "asio/impl/system_executor.ipp" -#endif // defined(ASIO_HEADER_ONLY) #endif // ASIO_SYSTEM_EXECUTOR_HPP diff --git a/src/third_party/asio-master/asio/include/asio/system_timer.hpp b/src/third_party/asio-master/asio/include/asio/system_timer.hpp index d28e92c2dd4..a6d265b6bdf 100644 --- a/src/third_party/asio-master/asio/include/asio/system_timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/system_timer.hpp @@ -2,7 +2,7 @@ // system_timer.hpp // ~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/thread.hpp b/src/third_party/asio-master/asio/include/asio/thread.hpp index 45ae3926d9e..b587a2b0e39 100644 --- a/src/third_party/asio-master/asio/include/asio/thread.hpp +++ b/src/third_party/asio-master/asio/include/asio/thread.hpp @@ -2,7 +2,7 @@ // thread.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/thread_pool.hpp b/src/third_party/asio-master/asio/include/asio/thread_pool.hpp index f62fc9d880e..ae915b3ec72 100644 --- a/src/third_party/asio-master/asio/include/asio/thread_pool.hpp +++ b/src/third_party/asio-master/asio/include/asio/thread_pool.hpp @@ -2,7 +2,7 @@ // thread_pool.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/time_traits.hpp b/src/third_party/asio-master/asio/include/asio/time_traits.hpp index c046794228a..9c80722e7da 100644 --- a/src/third_party/asio-master/asio/include/asio/time_traits.hpp +++ b/src/third_party/asio-master/asio/include/asio/time_traits.hpp @@ -2,7 +2,7 @@ // time_traits.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/buffer.hpp b/src/third_party/asio-master/asio/include/asio/ts/buffer.hpp index 257de209ce8..3fdce8ac2f5 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/buffer.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/buffer.hpp @@ -2,7 +2,7 @@ // ts/buffer.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/executor.hpp b/src/third_party/asio-master/asio/include/asio/ts/executor.hpp index d67c72e5201..24a12c0636c 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/executor.hpp @@ -2,7 +2,7 @@ // ts/executor.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/internet.hpp b/src/third_party/asio-master/asio/include/asio/ts/internet.hpp index 39e5b851935..8c1f89f9885 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/internet.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/internet.hpp @@ -2,7 +2,7 @@ // ts/internet.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/io_context.hpp b/src/third_party/asio-master/asio/include/asio/ts/io_context.hpp index fc7e8f82881..d82db95d272 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/io_context.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/io_context.hpp @@ -2,7 +2,7 @@ // ts/io_context.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/net.hpp b/src/third_party/asio-master/asio/include/asio/ts/net.hpp index 5af4c6f8cd0..1ea7c95370c 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/net.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/net.hpp @@ -2,7 +2,7 @@ // ts/net.hpp // ~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/netfwd.hpp b/src/third_party/asio-master/asio/include/asio/ts/netfwd.hpp index 59029218e19..b0e75bc72ef 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/netfwd.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/netfwd.hpp @@ -2,7 +2,7 @@ // ts/netfwd.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/socket.hpp b/src/third_party/asio-master/asio/include/asio/ts/socket.hpp index ecc4a2e3472..c9002c060c1 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/socket.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/socket.hpp @@ -2,7 +2,7 @@ // ts/socket.hpp // ~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/ts/timer.hpp b/src/third_party/asio-master/asio/include/asio/ts/timer.hpp index a47d6565d53..c760efca0e1 100644 --- a/src/third_party/asio-master/asio/include/asio/ts/timer.hpp +++ b/src/third_party/asio-master/asio/include/asio/ts/timer.hpp @@ -2,7 +2,7 @@ // ts/timer.hpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/unyield.hpp b/src/third_party/asio-master/asio/include/asio/unyield.hpp index ccbb043547e..37539810de6 100644 --- a/src/third_party/asio-master/asio/include/asio/unyield.hpp +++ b/src/third_party/asio-master/asio/include/asio/unyield.hpp @@ -2,7 +2,7 @@ // unyield.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/use_future.hpp b/src/third_party/asio-master/asio/include/asio/use_future.hpp index 2a0e24ff94d..b1d65b3c28a 100644 --- a/src/third_party/asio-master/asio/include/asio/use_future.hpp +++ b/src/third_party/asio-master/asio/include/asio/use_future.hpp @@ -2,7 +2,7 @@ // use_future.hpp // ~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -125,10 +125,10 @@ private: /** * See the documentation for asio::use_future_t for a usage example. */ -#if defined(ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION) -constexpr use_future_t<> use_future; -#elif defined(ASIO_MSVC) +#if defined(ASIO_MSVC) __declspec(selectany) use_future_t<> use_future; +#elif defined(ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION) +constexpr use_future_t<> use_future; #endif } // namespace asio diff --git a/src/third_party/asio-master/asio/include/asio/uses_executor.hpp b/src/third_party/asio-master/asio/include/asio/uses_executor.hpp index 53b727275fb..455a8c6f045 100644 --- a/src/third_party/asio-master/asio/include/asio/uses_executor.hpp +++ b/src/third_party/asio-master/asio/include/asio/uses_executor.hpp @@ -2,7 +2,7 @@ // uses_executor.hpp // ~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/version.hpp b/src/third_party/asio-master/asio/include/asio/version.hpp index 40b4e9aae97..3e5cde61842 100644 --- a/src/third_party/asio-master/asio/include/asio/version.hpp +++ b/src/third_party/asio-master/asio/include/asio/version.hpp @@ -2,7 +2,7 @@ // version.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/wait_traits.hpp b/src/third_party/asio-master/asio/include/asio/wait_traits.hpp index 0cc60985242..e27a735c874 100644 --- a/src/third_party/asio-master/asio/include/asio/wait_traits.hpp +++ b/src/third_party/asio-master/asio/include/asio/wait_traits.hpp @@ -2,7 +2,7 @@ // wait_traits.hpp // ~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/waitable_timer_service.hpp b/src/third_party/asio-master/asio/include/asio/waitable_timer_service.hpp index bcb228d2ebc..f8e99baf6ff 100644 --- a/src/third_party/asio-master/asio/include/asio/waitable_timer_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/waitable_timer_service.hpp @@ -2,7 +2,7 @@ // waitable_timer_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/basic_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/basic_handle.hpp index 3b1ce2cc2db..966a1b2f2de 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/basic_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/basic_handle.hpp @@ -2,7 +2,7 @@ // windows/basic_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/basic_object_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/basic_object_handle.hpp index d134dbfb1db..a260373ffff 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/basic_object_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/basic_object_handle.hpp @@ -2,7 +2,7 @@ // windows/basic_object_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2011 Boris Schaeling (boris@highscore.de) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/windows/basic_random_access_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/basic_random_access_handle.hpp index 4e9ebe5b7dc..f33957bf84e 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/basic_random_access_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/basic_random_access_handle.hpp @@ -2,7 +2,7 @@ // windows/basic_random_access_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/basic_stream_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/basic_stream_handle.hpp index c0a11fcf1af..b8f98b4aedb 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/basic_stream_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/basic_stream_handle.hpp @@ -2,7 +2,7 @@ // windows/basic_stream_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/object_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/object_handle.hpp index 6b5ad598b11..ede155524d0 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/object_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/object_handle.hpp @@ -2,7 +2,7 @@ // windows/object_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2011 Boris Schaeling (boris@highscore.de) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/windows/object_handle_service.hpp b/src/third_party/asio-master/asio/include/asio/windows/object_handle_service.hpp index 524a9f89003..cdefa0dba54 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/object_handle_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/object_handle_service.hpp @@ -2,7 +2,7 @@ // windows/object_handle_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2011 Boris Schaeling (boris@highscore.de) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/src/third_party/asio-master/asio/include/asio/windows/overlapped_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/overlapped_handle.hpp index 3db0f1dac3c..41130f8adba 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/overlapped_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/overlapped_handle.hpp @@ -2,7 +2,7 @@ // windows/overlapped_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/overlapped_ptr.hpp b/src/third_party/asio-master/asio/include/asio/windows/overlapped_ptr.hpp index 00f3baaaacc..17751662062 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/overlapped_ptr.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/overlapped_ptr.hpp @@ -2,7 +2,7 @@ // windows/overlapped_ptr.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/random_access_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/random_access_handle.hpp index cc3ea5c22dd..62e9ff3d894 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/random_access_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/random_access_handle.hpp @@ -2,7 +2,7 @@ // windows/random_access_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/random_access_handle_service.hpp b/src/third_party/asio-master/asio/include/asio/windows/random_access_handle_service.hpp index b3df24abaf4..0dd66b4a43d 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/random_access_handle_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/random_access_handle_service.hpp @@ -2,7 +2,7 @@ // windows/random_access_handle_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/stream_handle.hpp b/src/third_party/asio-master/asio/include/asio/windows/stream_handle.hpp index 583637af956..c273661fdb3 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/stream_handle.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/stream_handle.hpp @@ -2,7 +2,7 @@ // windows/stream_handle.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/windows/stream_handle_service.hpp b/src/third_party/asio-master/asio/include/asio/windows/stream_handle_service.hpp index 5da3dd7fc9f..62f62958ea0 100644 --- a/src/third_party/asio-master/asio/include/asio/windows/stream_handle_service.hpp +++ b/src/third_party/asio-master/asio/include/asio/windows/stream_handle_service.hpp @@ -2,7 +2,7 @@ // windows/stream_handle_service.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/write.hpp b/src/third_party/asio-master/asio/include/asio/write.hpp index 001086202a7..dadab67587d 100644 --- a/src/third_party/asio-master/asio/include/asio/write.hpp +++ b/src/third_party/asio-master/asio/include/asio/write.hpp @@ -2,7 +2,7 @@ // write.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/write_at.hpp b/src/third_party/asio-master/asio/include/asio/write_at.hpp index 17227748964..7cd053f9663 100644 --- a/src/third_party/asio-master/asio/include/asio/write_at.hpp +++ b/src/third_party/asio-master/asio/include/asio/write_at.hpp @@ -2,7 +2,7 @@ // write_at.hpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/include/asio/yield.hpp b/src/third_party/asio-master/asio/include/asio/yield.hpp index fa178172e5b..a739939b11a 100644 --- a/src/third_party/asio-master/asio/include/asio/yield.hpp +++ b/src/third_party/asio-master/asio/include/asio/yield.hpp @@ -2,7 +2,7 @@ // yield.hpp // ~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/src/asio.cpp b/src/third_party/asio-master/asio/src/asio.cpp index 2125d620fee..3fc5d89884b 100644 --- a/src/third_party/asio-master/asio/src/asio.cpp +++ b/src/third_party/asio-master/asio/src/asio.cpp @@ -2,7 +2,7 @@ // asio.cpp // ~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/src/asio_ssl.cpp b/src/third_party/asio-master/asio/src/asio_ssl.cpp index 68a16c0c5f1..959c14a9fd0 100644 --- a/src/third_party/asio-master/asio/src/asio_ssl.cpp +++ b/src/third_party/asio-master/asio/src/asio_ssl.cpp @@ -2,7 +2,7 @@ // asio_ssl.cpp // ~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) diff --git a/src/third_party/asio-master/asio/tsify.pl b/src/third_party/asio-master/asio/tsify.pl index 3dc1038caad..db928c3bc8d 100755 --- a/src/third_party/asio-master/asio/tsify.pl +++ b/src/third_party/asio-master/asio/tsify.pl @@ -530,7 +530,7 @@ sub create_top_level_includes print($output "// experimental/$include\n"); print($output "// " . '~' x length("experimental/" . $include) . "\n"); print($output "//\n"); - print($output "// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)\n"); + print($output "// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)\n"); print($output "//\n"); print($output "// Distributed under the Boost Software License, Version 1.0. (See accompanying\n"); print($output "// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n"); diff --git a/src/third_party/asio-master/patches/0001-Fix-signature-and-implementation-of-dev_poll_reactor.patch b/src/third_party/asio-master/patches/0001-Fix-signature-and-implementation-of-dev_poll_reactor.patch deleted file mode 100644 index 111aecd8d71..00000000000 --- a/src/third_party/asio-master/patches/0001-Fix-signature-and-implementation-of-dev_poll_reactor.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 262a53a7d9f2a987ed34c0e03a7f6180c7315cd6 Mon Sep 17 00:00:00 2001 -From: Spencer Jackson <spencer.jackson@mongodb.com> -Date: Fri, 28 Apr 2017 13:15:18 -0400 -Subject: [PATCH] Fix signature and implementation of dev_poll_reactor::run - ---- - asio/include/asio/detail/dev_poll_reactor.hpp | 2 +- - asio/include/asio/detail/impl/dev_poll_reactor.ipp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/asio/include/asio/detail/dev_poll_reactor.hpp b/asio/include/asio/detail/dev_poll_reactor.hpp -index 1f59cf30..2ea8dd46 100644 ---- a/asio/include/asio/detail/dev_poll_reactor.hpp -+++ b/asio/include/asio/detail/dev_poll_reactor.hpp -@@ -137,11 +137,11 @@ public: - void move_timer(timer_queue<Time_Traits>& queue, - typename timer_queue<Time_Traits>::per_timer_data& target, - typename timer_queue<Time_Traits>::per_timer_data& source); - - // Run /dev/poll once until interrupted or events are ready to be dispatched. -- ASIO_DECL void run(bool block, op_queue<operation>& ops); -+ ASIO_DECL void run(long usec, op_queue<operation>& ops); - - // Interrupt the select loop. - ASIO_DECL void interrupt(); - - private: -diff --git a/asio/include/asio/detail/impl/dev_poll_reactor.ipp b/asio/include/asio/detail/impl/dev_poll_reactor.ipp -index ac0cedea..c1d4fa0f 100644 ---- a/asio/include/asio/detail/impl/dev_poll_reactor.ipp -+++ b/asio/include/asio/detail/impl/dev_poll_reactor.ipp -@@ -238,11 +238,11 @@ void dev_poll_reactor::run(long usec, op_queue<operation>& ops) - { - asio::detail::mutex::scoped_lock lock(mutex_); - - // We can return immediately if there's no work to do and the reactor is - // not supposed to block. -- if (!block && op_queue_[read_op].empty() && op_queue_[write_op].empty() -+ if (usec == 0 && op_queue_[read_op].empty() && op_queue_[write_op].empty() - && op_queue_[except_op].empty() && timer_queues_.all_empty()) - return; - - // Write the pending event registration changes to the /dev/poll descriptor. - std::size_t events_size = sizeof(::pollfd) * pending_event_changes_.size(); --- -2.12.2 - diff --git a/src/third_party/asio-master/patches/0001-Switch-GetModuleHandle-occurence-to-GetModuleHandleA.patch b/src/third_party/asio-master/patches/0001-Switch-GetModuleHandle-occurence-to-GetModuleHandleA.patch deleted file mode 100644 index c14820e0f6c..00000000000 --- a/src/third_party/asio-master/patches/0001-Switch-GetModuleHandle-occurence-to-GetModuleHandleA.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8f8db1e1aa589c4cfe5bee3fd2d36b88397625a2 Mon Sep 17 00:00:00 2001 -From: Spencer Jackson <spencer.jackson@mongodb.com> -Date: Fri, 28 Apr 2017 11:19:41 -0400 -Subject: [PATCH 1/2] Switch GetModuleHandle occurence to GetModuleHandleA - ---- - asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp b/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp -index 37e41ec4..758726f6 100644 ---- a/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp -+++ b/asio/include/asio/detail/impl/win_iocp_socket_service_base.ipp -@@ -742,11 +742,11 @@ win_iocp_socket_service_base::nt_set_info_fn - win_iocp_socket_service_base::get_nt_set_info() - { - void* ptr = interlocked_compare_exchange_pointer(&nt_set_info_, 0, 0); - if (!ptr) - { -- if (HMODULE h = GetModuleHandle("NTDLL.DLL")) -+ if (HMODULE h = GetModuleHandleA("NTDLL.DLL")) - ptr = reinterpret_cast<void*>(GetProcAddress(h, "NtSetInformationFile")); - - // On failure, set nt_set_info_ to a special value to indicate that the - // NtSetInformationFile function is unavailable. That way we won't bother - // trying to look it up again. --- -2.12.2 - diff --git a/src/third_party/scripts/asio_get_sources.sh b/src/third_party/scripts/asio_get_sources.sh index 6f79f8aa1eb..5df72cdf2ed 100755 --- a/src/third_party/scripts/asio_get_sources.sh +++ b/src/third_party/scripts/asio_get_sources.sh @@ -13,7 +13,7 @@ if [ "$#" -ne 0 ]; then fi NAME=asio -REVISION=524288cb4fcf84664b3dc39cb4424c7509969b92 +REVISION=230c0d2ae035c5ce1292233fcab03cea0d341264 SRC_ROOT=$(mktemp -d /tmp/asio.XXXXXX) #trap "rm -rf $SRC_ROOT" EXIT SRC=${SRC_ROOT}/${NAME}_${REVISION} |