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

Subject: [Boost-commit] svn:boost r58344 - in sandbox/fiber: boost/fiber boost/fiber/spin libs/fiber/src
From: oliver.kowalke_at_[hidden]
Date: 2009-12-13 06:49:11

Author: olli
Date: 2009-12-13 06:49:10 EST (Sun, 13 Dec 2009)
New Revision: 58344
URL: http://svn.boost.org/trac/boost/changeset/58344

Log:
- win32 correction
Text files modified: 
   sandbox/fiber/boost/fiber/mutex.hpp          |     9 +++++++++                               
   sandbox/fiber/boost/fiber/spin/future.hpp    |    10 +++++-----                              
   sandbox/fiber/libs/fiber/src/round_robin.cpp |     4 ++--                                    
   3 files changed, 16 insertions(+), 7 deletions(-)

Modified: sandbox/fiber/boost/fiber/mutex.hpp
==============================================================================
--- sandbox/fiber/boost/fiber/mutex.hpp	(original)
+++ sandbox/fiber/boost/fiber/mutex.hpp	2009-12-13 06:49:10 EST (Sun, 13 Dec 2009)
@@ -17,6 +17,11 @@
 #include <boost/fiber/scheduler.hpp>
 #include <boost/fiber/strategy.hpp>
 
+# if defined(BOOST_MSVC)
+# pragma warning(push)
+# pragma warning(disable:4355)
+# endif
+
 namespace boost {
 namespace fibers {
 
@@ -50,4 +55,8 @@
 
 }}
 
+# if defined(BOOST_MSVC)
+# pragma warning(pop)
+# endif
+
 #endif // BOOST_FIBERS_MUTEX_H

Modified: sandbox/fiber/boost/fiber/spin/future.hpp
==============================================================================
--- sandbox/fiber/boost/fiber/spin/future.hpp	(original)
+++ sandbox/fiber/boost/fiber/spin/future.hpp	2009-12-13 06:49:10 EST (Sun, 13 Dec 2009)
@@ -180,12 +180,12 @@
 
     void mark_finished_with_result(source_reference_type result_)
     {
-        boost::lock_guard<mutex> lock(mutex);
+        boost::lock_guard<mutex> lock(mtx);
         mark_finished_with_result_internal(result_);
     }
     void mark_finished_with_result(rvalue_source_type result_)
     {
-        boost::lock_guard<mutex> lock(mutex);
+        boost::lock_guard<mutex> lock(mtx);
         mark_finished_with_result_internal(result_);
     }
 
@@ -197,7 +197,7 @@
 
     future_state::state get_state()
     {
-        boost::lock_guard<mutex> guard(mutex);
+        boost::lock_guard<mutex> guard(mtx);
         if(!done)
         {
             return future_state::waiting;
@@ -226,7 +226,7 @@
 
     void mark_finished_with_result()
     {
-        boost::lock_guard<mutex> lock(mutex);
+        boost::lock_guard<mutex> lock(mtx);
         mark_finished_with_result_internal();
     }
 
@@ -237,7 +237,7 @@
     
     future_state::state get_state()
     {
-        boost::lock_guard<mutex> guard(mutex);
+        boost::lock_guard<mutex> guard(mtx);
         if(!done)
         {
             return future_state::waiting;

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-12-13 06:49:10 EST (Sun, 13 Dec 2009)
@@ -127,7 +127,7 @@
                 // remove it from the waiting-queue, reset waiting-on
                 // and reset the waiting state
                 BOOST_ASSERT( s.waiting_on_object);
-		objects_.at( * s.waiting_on_object).remove( id);
+		objects_[* s.waiting_on_object].remove( id);
                 fibers_[id].waiting_on_object.reset();
                 set_state_ready( f);
                 runnable_fibers_.push_back( id);
@@ -261,7 +261,7 @@
         BOOST_ASSERT( ! s.waiting_on_object);
 
         // register on object to be waiting on
-	objects_.at( oid).push_back( id);
+	objects_[oid].push_back( id);
         
         // set state waiting
         set_state_wait_for_object( f);