From 2c1f66af77c55c21d8b37b20de0689c05b2fdee3 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Thu, 20 Aug 2015 20:56:00 +0200 Subject: [PATCH] modify asio examples --- examples/asio/daytime_client.cpp | 4 +--- examples/asio/daytime_client2.cpp | 4 +--- examples/asio/echo_server.cpp | 5 +---- examples/asio/echo_server2.cpp | 4 +--- examples/asio/publish_subscribe/server.cpp | 6 ++---- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/examples/asio/daytime_client.cpp b/examples/asio/daytime_client.cpp index d7f0c1e1..acd5653b 100644 --- a/examples/asio/daytime_client.cpp +++ b/examples/asio/daytime_client.cpp @@ -88,9 +88,7 @@ int main( int argc, char* argv[]) boost::bind( get_daytime, boost::ref( io_service), argv[1]) ); - boost::fibers::fiber f( - boost::bind( boost::fibers::asio::run_service, boost::ref( io_service) ) ); - f.join(); + boost::fibers::asio::run_service( io_service); } catch ( std::exception& e) { diff --git a/examples/asio/daytime_client2.cpp b/examples/asio/daytime_client2.cpp index 15a5ae85..b59f6ec7 100644 --- a/examples/asio/daytime_client2.cpp +++ b/examples/asio/daytime_client2.cpp @@ -79,9 +79,7 @@ int main( int argc, char* argv[]) boost::bind( get_daytime, boost::ref( io_service), argv[1]) ); - boost::fibers::fiber f( - boost::bind( boost::fibers::asio::run_service, boost::ref( io_service) ) ); - f.join(); + boost::fibers::asio::run_service( io_service); } catch ( std::exception& e) { diff --git a/examples/asio/echo_server.cpp b/examples/asio/echo_server.cpp index 20c8416f..b766a71b 100644 --- a/examples/asio/echo_server.cpp +++ b/examples/asio/echo_server.cpp @@ -19,7 +19,6 @@ #include #include "loop.hpp" -#include "spawn.hpp" #include "yield.hpp" using boost::asio::ip::tcp; @@ -94,9 +93,7 @@ int main( int argc, char* argv[]) boost::fibers::fiber( boost::bind( server, boost::ref( io_service), atoi( argv[1]) ) ).detach(); - boost::fibers::fiber f( - boost::bind( boost::fibers::asio::run_service, boost::ref( io_service) ) ); - f.join(); + boost::fibers::asio::run_service( io_service); } catch ( std::exception const& e) { std::cerr << "Exception: " << e.what() << "\n"; } diff --git a/examples/asio/echo_server2.cpp b/examples/asio/echo_server2.cpp index 1018b4ca..e3cee140 100644 --- a/examples/asio/echo_server2.cpp +++ b/examples/asio/echo_server2.cpp @@ -129,9 +129,7 @@ int main( int argc, char* argv[]) boost::bind( do_accept, boost::ref( io_service), atoi( argv[1]), _1) ); - boost::fibers::fiber f( - boost::bind( boost::fibers::asio::run_service, boost::ref( io_service) ) ); - f.join(); + boost::fibers::asio::run_service( io_service); } catch ( std::exception const& e) { std::cerr << "Exception: " << e.what() << "\n"; } diff --git a/examples/asio/publish_subscribe/server.cpp b/examples/asio/publish_subscribe/server.cpp index ad21372c..6a47fb31 100644 --- a/examples/asio/publish_subscribe/server.cpp +++ b/examples/asio/publish_subscribe/server.cpp @@ -414,10 +414,8 @@ int main( int argc, char* argv[]) boost::fibers::asio::spawn( io_service, boost::bind( accept_subscriber, boost::ref( io_service), 9998, boost::ref( reg), _1) ); - - boost::fibers::fiber f( - boost::bind( boost::fibers::asio::run_service, boost::ref( io_service) ) ); - f.join(); + + boost::fibers::asio::run_service( io_service); } catch ( std::exception const& e) { std::cerr << "Exception: " << e.what() << "\n"; }