Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85377 - in branches/release: boost/coroutine libs/coroutine libs/coroutine/build libs/coroutine/example/cpp03 libs/coroutine/example/cpp11 libs/coroutine/test
From: oliver.kowalke_at_[hidden]
Date: 2013-08-17 12:13:43


Author: olli
Date: 2013-08-17 12:13:43 EDT (Sat, 17 Aug 2013)
New Revision: 85377
URL: http://svn.boost.org/trac/boost/changeset/85377

Log:
coroutine: merge from trunk

Properties modified:
   branches/release/boost/coroutine/ (props changed)
   branches/release/libs/coroutine/ (props changed)
Text files modified:
   branches/release/libs/coroutine/build/Jamfile.v2 | 2 ++
   branches/release/libs/coroutine/example/cpp03/Jamfile.v2 | 1 -
   branches/release/libs/coroutine/example/cpp11/Jamfile.v2 | 1 -
   branches/release/libs/coroutine/test/Jamfile.v2 | 2 --
   4 files changed, 2 insertions(+), 4 deletions(-)

Modified: branches/release/libs/coroutine/build/Jamfile.v2
==============================================================================
--- branches/release/libs/coroutine/build/Jamfile.v2 Sat Aug 17 12:11:33 2013 (r85376)
+++ branches/release/libs/coroutine/build/Jamfile.v2 2013-08-17 12:13:43 EDT (Sat, 17 Aug 2013) (r85377)
@@ -14,6 +14,7 @@
 project boost/coroutine
     : requirements
       <library>/boost/context//boost_context
+ <library>/boost/system//boost_system
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>gcc-4.7,<segmented-stacks>on:<linkflags>"-static-libgcc"
       <toolset>gcc-4.8,<segmented-stacks>on:<cxxflags>-fsplit-stack
@@ -47,6 +48,7 @@
       detail/coroutine_context.cpp
       exceptions.cpp
     : <link>shared:<library>../../context/build//boost_context
+ <link>shared:<library>../../system/build//boost_system
     ;
 
 boost-install boost_coroutine ;

Modified: branches/release/libs/coroutine/example/cpp03/Jamfile.v2
==============================================================================
--- branches/release/libs/coroutine/example/cpp03/Jamfile.v2 Sat Aug 17 12:11:33 2013 (r85376)
+++ branches/release/libs/coroutine/example/cpp03/Jamfile.v2 2013-08-17 12:13:43 EDT (Sat, 17 Aug 2013) (r85377)
@@ -33,7 +33,6 @@
     : requirements
       <library>../../build//boost_coroutine
       <library>/boost/program_options//boost_program_options
- <library>/boost/system//boost_system
       <library>/boost/thread//boost_thread
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>gcc-4.8,<segmented-stacks>on:<cxxflags>-fsplit-stack

Modified: branches/release/libs/coroutine/example/cpp11/Jamfile.v2
==============================================================================
--- branches/release/libs/coroutine/example/cpp11/Jamfile.v2 Sat Aug 17 12:11:33 2013 (r85376)
+++ branches/release/libs/coroutine/example/cpp11/Jamfile.v2 2013-08-17 12:13:43 EDT (Sat, 17 Aug 2013) (r85377)
@@ -33,7 +33,6 @@
     : requirements
       <library>../../build//boost_coroutine
       <library>/boost/program_options//boost_program_options
- <library>/boost/system//boost_system
       <library>/boost/thread//boost_thread
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>gcc-4.8,<segmented-stacks>on:<cxxflags>-fsplit-stack

Modified: branches/release/libs/coroutine/test/Jamfile.v2
==============================================================================
--- branches/release/libs/coroutine/test/Jamfile.v2 Sat Aug 17 12:11:33 2013 (r85376)
+++ branches/release/libs/coroutine/test/Jamfile.v2 2013-08-17 12:13:43 EDT (Sat, 17 Aug 2013) (r85377)
@@ -16,9 +16,7 @@
 project boost/coroutine/test
     : requirements
       <library>../../test/build//boost_unit_test_framework
- <library>/boost/context//boost_context
       <library>/boost/coroutine//boost_coroutine
- <library>/boost/system//boost_system
       <toolset>gcc-4.7,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <toolset>gcc-4.8,<segmented-stacks>on:<cxxflags>-fsplit-stack
       <link>static


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk