Explicitly mark asio::strand as deprecated. Use asio::io_service::strand instead.
diff --git a/asio/include/asio/strand.hpp b/asio/include/asio/strand.hpp index a81718b..7cf2dc5 100644 --- a/asio/include/asio/strand.hpp +++ b/asio/include/asio/strand.hpp
@@ -241,7 +241,8 @@ asio::detail::strand_service::implementation_type impl_; }; -/// Typedef for backwards compatibility. +/// (Deprecated: Use asio::io_service::strand.) Typedef for backwards +/// compatibility. typedef asio::io_service::strand strand; } // namespace asio
diff --git a/asio/src/examples/cpp03/tutorial/timer5/timer.cpp b/asio/src/examples/cpp03/tutorial/timer5/timer.cpp index 04c9d8c..a85b99f 100644 --- a/asio/src/examples/cpp03/tutorial/timer5/timer.cpp +++ b/asio/src/examples/cpp03/tutorial/timer5/timer.cpp
@@ -56,7 +56,7 @@ } private: - asio::strand strand_; + asio::io_service::strand strand_; asio::deadline_timer timer1_; asio::deadline_timer timer2_; int count_;
diff --git a/asio/src/tests/unit/strand.cpp b/asio/src/tests/unit/strand.cpp index 28272de..befbbab 100644 --- a/asio/src/tests/unit/strand.cpp +++ b/asio/src/tests/unit/strand.cpp
@@ -34,6 +34,7 @@ #endif // defined(ASIO_HAS_BOOST_BIND) using namespace asio; +typedef io_service::strand strand; #if defined(ASIO_HAS_BOOST_BIND) namespace bindns = boost;