[Boost-commit] svn:boost r57825 - in sandbox/fiber: boost/fiber libs/fiber/src

Subject: [Boost-commit] svn:boost r57825 - in sandbox/fiber: boost/fiber libs/fiber/src
From: oliver.kowalke_at_[hidden]
Date: 2009-11-20 19:03:21

Author: olli
Date: 2009-11-20 19:03:20 EST (Fri, 20 Nov 2009)
New Revision: 57825
URL: http://svn.boost.org/trac/boost/changeset/57825

Log:
- corrections
Text files modified: 
   sandbox/fiber/boost/fiber/locks.hpp          |    12 ++++++------                            
   sandbox/fiber/libs/fiber/src/round_robin.cpp |     9 +++------                               
   2 files changed, 9 insertions(+), 12 deletions(-)

Modified: sandbox/fiber/boost/fiber/locks.hpp
==============================================================================
--- sandbox/fiber/boost/fiber/locks.hpp	(original)
+++ sandbox/fiber/boost/fiber/locks.hpp	2009-11-20 19:03:20 EST (Fri, 20 Nov 2009)
@@ -122,7 +122,7 @@
             std::swap( locked_, other.locked_);
         }
 #else
-        unique_lock( detail::thread_move_t< unique_lock< Mutex > > other) :
+        unique_lock( boost::detail::fiber_move_t< unique_lock< Mutex > > other) :
                 mtx_( other->mtx_),
                 locked_( other->locked_)
         {
@@ -130,20 +130,20 @@
             other->mtx_ = 0;
         }
 
-        operator detail::thread_move_t< unique_lock< Mutex > >()
+        operator boost::detail::fiber_move_t< unique_lock< Mutex > >()
         { return move(); }
 
-        detail::thread_move_t< unique_lock< Mutex > > move()
-        { return detail::thread_move_t< unique_lock< Mutex > >( * this); }
+        boost::detail::fiber_move_t< unique_lock< Mutex > > move()
+        { return boost::detail::fiber_move_t< unique_lock< Mutex > >( * this); }
 
-        unique_lock & operator=( detail::thread_move_t< unique_lock< Mutex > > other)
+        unique_lock & operator=( boost::detail::fiber_move_t< unique_lock< Mutex > > other)
         {
             unique_lock tmp( other);
             swap( tmp);
             return * this;
         }
 
-        void swap( detail::thread_move_t< unique_lock< Mutex > > other)
+        void swap( boost::detail::fiber_move_t< unique_lock< Mutex > > other)
         {
             std::swap( mtx_, other->mtx_);
             std::swap( locked_, other->locked_);

Modified: sandbox/fiber/libs/fiber/src/round_robin.cpp
==============================================================================
--- sandbox/fiber/libs/fiber/src/round_robin.cpp	(original)
+++ sandbox/fiber/libs/fiber/src/round_robin.cpp	2009-11-20 19:03:20 EST (Fri, 20 Nov 2009)
@@ -162,7 +162,6 @@
 round_robin::interruption_requested() const
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
 
         return active_.interruption_requested();
 }
@@ -171,7 +170,6 @@
 round_robin::interruption_enabled() const
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
 
         return active_.info_()->interrupt == detail::INTERRUPTION_ENABLED;
 }
@@ -180,7 +178,7 @@
 round_robin::interrupt_flags()
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
+	BOOST_ASSERT( ! fibers_[active_.get_id()].waiting_on);
 
         return active_.info_()->interrupt;
 }
@@ -189,7 +187,6 @@
 round_robin::priority() const
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
 
         return active_.priority();
 }
@@ -198,7 +195,7 @@
 round_robin::priority( int prio)
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
+	BOOST_ASSERT( ! fibers_[active_.get_id()].waiting_on);
 
         // set priority
         active_.priority( prio);
@@ -208,7 +205,7 @@
 round_robin::at_exit( callable_t ca)
 {
         BOOST_ASSERT( STATE_RUNNING == active_.info_()->state);
-	BOOST_ASSERT( ! fibers_.at( active_.get_id() ).waiting_on);
+	BOOST_ASSERT( ! fibers_[active_.get_id()].waiting_on);
 
         // push a exit-callback on fibers stack
         active_.info_()->at_exit.push( ca);