bazelboost · pull · Sep 7, 2020 · Jan 1, 2018 · Jan 1, 2018 · Feb 5, 2018
diff --git a/README.md b/README.md
@@ -8,4 +8,7 @@ allows re-entering subroutines more than once (useful if state must be kept acro
 Coroutines can be viewed as a language-level construct providing a special kind of control flow.
 
 In contrast to threads, which are pre-emptive, coroutines switches are cooperative (programmer controls 
-when a switch will happen). The kernel is not involved in the coroutine switches.
+when a switch will happen). The kernel is not involved in the coroutine switches.
+
+Note that boost.coroutine is deprecated - boost.coroutine2 is its successor.
+If you are forced to use a pre-C++11 compiler you should still use boost.coroutine.
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
@@ -11,10 +11,9 @@ import toolset ;
 project boost/coroutine
     : requirements
       <library>/boost/context//boost_context
-      <library>/boost/system//boost_system
       <library>/boost/thread//boost_thread
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <toolset>clang,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>clang,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <link>shared:<define>BOOST_COROUTINES_DYN_LINK=1
@@ -40,7 +39,6 @@ lib boost_coroutine
       exceptions.cpp
       stack_traits_sources
     : <link>shared:<library>../../context/build//boost_context
-      <link>shared:<library>../../system/build//boost_system
       <link>shared:<library>../../thread/build//boost_thread
     ;
 

diff --git a/example/asymmetric/Jamfile.v2 b/example/asymmetric/Jamfile.v2
@@ -14,13 +14,13 @@ import modules ;
 import os ;
 import toolset ;
 
-project boost/coroutine/example
+project boost/coroutine/example/asymmetric
     : requirements
       <library>/boost/context//boost_context
       <library>/boost/coroutine//boost_coroutine
       <library>/boost/program_options//boost_program_options
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <toolset>clang,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>clang,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <link>shared

diff --git a/example/asymmetric/chaining.cpp b/example/asymmetric/chaining.cpp
@@ -4,14 +4,15 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <string>
 #include <cctype>
 #include <sstream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/foreach.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine<std::string> coro_t;

diff --git a/example/asymmetric/echo.cpp b/example/asymmetric/echo.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine< void >::pull_type pull_coro_t;
 typedef boost::coroutines::asymmetric_coroutine< void >::push_type push_coro_t;

diff --git a/example/asymmetric/exception.cpp b/example/asymmetric/exception.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 #include <stdexcept>
 #include <string>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/throw_exception.hpp>
 
 typedef boost::coroutines::asymmetric_coroutine< int >::pull_type pull_coro_t;

diff --git a/example/asymmetric/fibonacci.cpp b/example/asymmetric/fibonacci.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/range.hpp>
-#include <boost/coroutine/all.hpp>
 
 void fibonacci( boost::coroutines::asymmetric_coroutine< int >::push_type & sink)
 {

diff --git a/example/asymmetric/layout.cpp b/example/asymmetric/layout.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 #include <iomanip>
 #include <vector>
@@ -12,7 +14,6 @@
 
 #include <boost/assign/list_of.hpp>
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/range.hpp>
 
 struct FinalEOL

diff --git a/example/asymmetric/parallel.cpp b/example/asymmetric/parallel.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 void first( boost::coroutines::asymmetric_coroutine< void >::push_type & sink)
 {

diff --git a/example/asymmetric/power.cpp b/example/asymmetric/power.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 #include <boost/range.hpp>
-#include <boost/coroutine/all.hpp>
 
 void power( boost::coroutines::asymmetric_coroutine< int >::push_type & sink, int number, int exponent)
 {

diff --git a/example/asymmetric/same_fringe.cpp b/example/asymmetric/same_fringe.cpp
@@ -4,6 +4,8 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstddef>
 #include <cstdlib>
 #include <iostream>
@@ -14,7 +16,6 @@
 #include <boost/bind.hpp>
 #include <boost/range.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct node
 {

diff --git a/example/asymmetric/segmented_stack.cpp b/example/asymmetric/segmented_stack.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 
 int count = 384;
 

diff --git a/example/asymmetric/simple.cpp b/example/asymmetric/simple.cpp
@@ -1,8 +1,9 @@
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 #include "X.h"
 

diff --git a/example/asymmetric/test.cpp b/example/asymmetric/test.cpp
@@ -1,6 +1,7 @@
-#include <boost/bind.hpp>
 #include <boost/coroutine/all.hpp>
 
+#include <boost/bind.hpp>
+
 #include "X.h"
 
 typedef boost::coroutines::asymmetric_coroutine< X& >::pull_type pull_coro_t;

diff --git a/example/asymmetric/tree.h b/example/asymmetric/tree.h
@@ -7,12 +7,13 @@
 #ifndef TREE_H
 #define TREE_H
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstddef>
 #include <string>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/intrusive_ptr.hpp>
 
 #if defined(_MSC_VER)

diff --git a/example/asymmetric/unwind.cpp b/example/asymmetric/unwind.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct X : private boost::noncopyable
 {

diff --git a/example/symmetric/Jamfile.v2 b/example/symmetric/Jamfile.v2
@@ -14,14 +14,14 @@ import modules ;
 import os ;
 import toolset ;
 
-project boost/coroutine/example
+project boost/coroutine/example/symmetric
     : requirements
       <library>/boost/context//boost_context
       <library>/boost/coroutine//boost_coroutine
       <library>/boost/program_options//boost_program_options
       <library>/boost/random//boost_random
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
-      <toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-fsplit-stack
+      <target-os>linux,<toolset>gcc,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <toolset>clang,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>clang,<segmented-stacks>on:<cxxflags>-DBOOST_USE_SEGMENTED_STACKS
       <link>static

diff --git a/example/symmetric/dice_game.cpp b/example/symmetric/dice_game.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/move/move.hpp>
 #include <boost/random/random_device.hpp>
 #include <boost/random/uniform_int_distribution.hpp>

diff --git a/example/symmetric/merge_arrays.cpp b/example/symmetric/merge_arrays.cpp
@@ -4,13 +4,14 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <cstddef>
 #include <iostream>
 #include <vector>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/foreach.hpp>
 
 typedef boost::coroutines::symmetric_coroutine< void >  coro_t;
@@ -30,7 +31,7 @@ class merger
             to_.push_back(from[idx++]);
         }
         while ( to_.size() < max_)
-            to_.push_back( other->from[other->idx]); 
+            to_.push_back( other->from[other->idx++]); 
     }
 
     merger( merger const&);

diff --git a/example/symmetric/segmented_stack.cpp b/example/symmetric/segmented_stack.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <iostream>
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#include <boost/coroutine/all.hpp>
 #include <boost/thread.hpp>
 
 int count = 384;

diff --git a/example/symmetric/simple.cpp b/example/symmetric/simple.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 typedef boost::coroutines::symmetric_coroutine< void >  coro_t;
 

diff --git a/example/symmetric/unwind.cpp b/example/symmetric/unwind.cpp
@@ -4,11 +4,12 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/coroutine/all.hpp>
+
 #include <cstdlib>
 #include <iostream>
 
 #include <boost/bind.hpp>
-#include <boost/coroutine/all.hpp>
 
 struct X : private boost::noncopyable
 {