diff options
Diffstat (limited to 'libs/asio')
| -rw-r--r-- | libs/asio/doc/history.qbk | 20 | ||||
| -rw-r--r-- | libs/asio/doc/reference.qbk | 18 | ||||
| -rw-r--r-- | libs/asio/doc/reference.xsl | 6 | ||||
| -rw-r--r-- | libs/asio/doc/tutorial.qbk | 4 | ||||
| -rw-r--r-- | libs/asio/example/cpp03/tutorial/timer5/timer.cpp | 2 | ||||
| -rw-r--r-- | libs/asio/meta/libraries.json | 15 | ||||
| -rw-r--r-- | libs/asio/test/strand.cpp | 1 |
7 files changed, 54 insertions, 12 deletions
diff --git a/libs/asio/doc/history.qbk b/libs/asio/doc/history.qbk index 75d39ee35..cae14f801 100644 --- a/libs/asio/doc/history.qbk +++ b/libs/asio/doc/history.qbk @@ -7,6 +7,26 @@ [section:history Revision History] +[heading Asio 1.10.5 / Boost 1.57] + +* Fixed the [^kqueue] reactor so that it works on FreeBSD ([ticket 10606]). +* Fixed an issue in the [^kqueue] reactor which resulted in spinning when using + serial ports on Mac OS ([ticket 10496]). +* Fixed [^kqueue] reactor support for read-only file descriptors + ([ticket 10367]). +* Fixed a compile error when using the [^/dev/poll] reactor ([ticket 10350], + [ticket 10572]). +* Changed the Windows backend to use `WSASocketW`, as `WSASocketA` has been + deprecated ([ticket 10534]). +* Fixed some warnings reported by Visual C++ 2013 ([ticket 10376]). +* Fixed integer type used in the WinRT version of the byte-order conversion + functions ([ticket 10539]). +* Changed documentation to indicate that `use_future` and `spawn()` are not + made available when including the `asio.hpp` convenience header ([ticket + 10567]). +* Explicitly marked `asio::strand` as deprecated. Use + `asio::io_service::strand` instead. + [heading Asio 1.10.4 / Boost 1.56] * Stopped using certain Winsock functions that are marked as deprecated in the diff --git a/libs/asio/doc/reference.qbk b/libs/asio/doc/reference.qbk index c0acd88f5..9e7862bfe 100644 --- a/libs/asio/doc/reference.qbk +++ b/libs/asio/doc/reference.qbk @@ -45199,7 +45199,7 @@ The initiating function (async\_read\_some in the above example) suspends the cu ['Header: ][^boost/asio/spawn.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [section:basic_yield_context basic_yield_context::basic_yield_context] @@ -45247,7 +45247,7 @@ When using Boost.Coroutine v2 (unidirectional coroutines), this type is: ['Header: ][^boost/asio/spawn.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [endsect] @@ -45280,7 +45280,7 @@ When using Boost.Coroutine v2 (unidirectional coroutines), this type is: ['Header: ][^boost/asio/spawn.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [endsect] @@ -88153,7 +88153,7 @@ The `spawn()` function is a high-level wrapper over the Boost.Coroutine library. ['Header: ][^boost/asio/spawn.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [section:overload1 spawn (1 of 4 overloads)] @@ -93875,7 +93875,7 @@ This typedef uses the C++11 `<chrono>` standard library facility, if available. [section:strand strand] [indexterm1 strand] -Typedef for backwards compatibility. +(Deprecated: Use [link boost_asio.reference.io_service__strand `io_service::strand`].) Typedef for backwards compatibility. typedef boost::asio::io_service::strand strand; @@ -95725,7 +95725,7 @@ See the documentation for [link boost_asio.reference.use_future_t `use_future_t` ['Header: ][^boost/asio/use_future.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [endsect] @@ -95794,7 +95794,7 @@ The initiating function (async\_read\_some in the above example) returns a futur ['Header: ][^boost/asio/use_future.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [section:allocator_type use_future_t::allocator_type] @@ -95811,7 +95811,7 @@ The allocator type. The allocator is used when constructing the `std::promise` o ['Header: ][^boost/asio/use_future.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [endsect] @@ -105369,7 +105369,7 @@ The initiating function (async\_read\_some in the above example) suspends the cu ['Header: ][^boost/asio/spawn.hpp] -['Convenience header: ][^boost/asio.hpp] +['Convenience header: ]None [endsect] diff --git a/libs/asio/doc/reference.xsl b/libs/asio/doc/reference.xsl index d47186325..745584c13 100644 --- a/libs/asio/doc/reference.xsl +++ b/libs/asio/doc/reference.xsl @@ -752,12 +752,18 @@ <xsl:when test="contains($file, 'boost/asio/high_resolution_timer')"> <xsl:text>None</xsl:text> </xsl:when> + <xsl:when test="contains($file, 'boost/asio/spawn')"> + <xsl:text>None</xsl:text> + </xsl:when> <xsl:when test="contains($file, 'boost/asio/steady_timer')"> <xsl:text>None</xsl:text> </xsl:when> <xsl:when test="contains($file, 'boost/asio/system_timer')"> <xsl:text>None</xsl:text> </xsl:when> + <xsl:when test="contains($file, 'boost/asio/use_future')"> + <xsl:text>None</xsl:text> + </xsl:when> <xsl:otherwise> <xsl:text>[^boost/asio.hpp]</xsl:text> </xsl:otherwise> diff --git a/libs/asio/doc/tutorial.qbk b/libs/asio/doc/tutorial.qbk index 4096e4737..afff0a035 100644 --- a/libs/asio/doc/tutorial.qbk +++ b/libs/asio/doc/tutorial.qbk @@ -707,7 +707,7 @@ In a multithreaded program, the handlers for asynchronous operations should be s ``''''''`` } ``''''''``private: - ``''''''`` boost::asio::strand strand_; + ``''''''`` boost::asio::io_service::strand strand_; ``''''''`` boost::asio::deadline_timer timer1_; ``''''''`` boost::asio::deadline_timer timer2_; ``''''''`` int count_; @@ -806,7 +806,7 @@ Previous: [link boost_asio.tutorial.tuttimer4 Timer.4 - Using a member function ``''''''`` } ``''''''``private: - ``''''''`` boost::asio::strand strand_; + ``''''''`` boost::asio::io_service::strand strand_; ``''''''`` boost::asio::deadline_timer timer1_; ``''''''`` boost::asio::deadline_timer timer2_; ``''''''`` int count_; diff --git a/libs/asio/example/cpp03/tutorial/timer5/timer.cpp b/libs/asio/example/cpp03/tutorial/timer5/timer.cpp index 85d81fa60..6e87c54f1 100644 --- a/libs/asio/example/cpp03/tutorial/timer5/timer.cpp +++ b/libs/asio/example/cpp03/tutorial/timer5/timer.cpp @@ -57,7 +57,7 @@ public: } private: - boost::asio::strand strand_; + boost::asio::io_service::strand strand_; boost::asio::deadline_timer timer1_; boost::asio::deadline_timer timer2_; int count_; diff --git a/libs/asio/meta/libraries.json b/libs/asio/meta/libraries.json new file mode 100644 index 000000000..685753d08 --- /dev/null +++ b/libs/asio/meta/libraries.json @@ -0,0 +1,15 @@ +{ + "key": "asio", + "name": "Asio", + "authors": [ + "Chris Kohlhoff" + ], + "description": "Portable networking and other low-level I/O, including sockets, timers, hostname resolution, socket iostreams, serial ports, file descriptors and Windows HANDLEs.", + "category": [ + "Concurrent", + "IO" + ], + "maintainers": [ + "Chris Kohlhoff <chris -at- kohlhoff.com>" + ] +} diff --git a/libs/asio/test/strand.cpp b/libs/asio/test/strand.cpp index 24c729336..be0cb8f44 100644 --- a/libs/asio/test/strand.cpp +++ b/libs/asio/test/strand.cpp @@ -34,6 +34,7 @@ #endif // defined(BOOST_ASIO_HAS_BOOST_BIND) using namespace boost::asio; +typedef io_service::strand strand; #if defined(BOOST_ASIO_HAS_BOOST_BIND) namespace bindns = boost; |