[Boost-commit] svn:boost r81035 - branches/release/boost/thread

Subject: [Boost-commit] svn:boost r81035 - branches/release/boost/thread
From: vicente.botet_at_[hidden]
Date: 2012-10-21 07:56:53

Author: viboes
Date: 2012-10-21 07:56:52 EDT (Sun, 21 Oct 2012)
New Revision: 81035
URL: http://svn.boost.org/trac/boost/changeset/81035

Log:
Thread: merge [81032][81034]
Text files modified: 
   branches/release/boost/thread/future.hpp |    11 ++++++++---                             
   1 files changed, 8 insertions(+), 3 deletions(-)

Modified: branches/release/boost/thread/future.hpp
==============================================================================
--- branches/release/boost/thread/future.hpp	(original)
+++ branches/release/boost/thread/future.hpp	2012-10-21 07:56:52 EDT (Sun, 21 Oct 2012)
@@ -594,13 +594,18 @@
 
             struct all_futures_lock
             {
-                count_type count;
+#ifdef _MANAGED
+                typedef std::ptrdiff_t count_type_portable;
+#else
+                typedef count_type count_type_portable;
+#endif
+                count_type_portable count;
                 boost::scoped_array<boost::unique_lock<boost::mutex> > locks;
 
                 all_futures_lock(std::vector<registered_waiter>& futures):
                     count(futures.size()),locks(new boost::unique_lock<boost::mutex>[count])
                 {
-                    for(count_type i=0;i<count;++i)
+                    for(count_type_portable i=0;i<count;++i)
                     {
 #if defined __DECCXX || defined __SUNPRO_CC || defined __hpux
                         locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex).move();
@@ -617,7 +622,7 @@
 
                 void unlock()
                 {
-                    for(count_type i=0;i<count;++i)
+                    for(count_type_portable i=0;i<count;++i)
                     {
                         locks[i].unlock();
                     }