[Boost-commit] svn:boost r84952 - in trunk: boost/thread libs/thread/test

Subject: [Boost-commit] svn:boost r84952 - in trunk: boost/thread libs/thread/test
From: vicente.botet_at_[hidden]
Date: 2013-07-04 17:38:33

Author: viboes
Date: 2013-07-04 17:38:33 EDT (Thu, 04 Jul 2013)
New Revision: 84952
URL: http://svn.boost.org/trac/boost/changeset/84952

Log:
Thread: remove warning in barrier.hpp.

Text files modified: 
   trunk/boost/thread/barrier.hpp                   |     4 ++--                                    
   trunk/libs/thread/test/test_barrier_size_fct.cpp |     2 +-                                      
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/thread/barrier.hpp
==============================================================================
--- trunk/boost/thread/barrier.hpp	Thu Jul  4 11:31:32 2013	(r84951)
+++ trunk/boost/thread/barrier.hpp	2013-07-04 17:38:33 EDT (Thu, 04 Jul 2013)	(r84952)
@@ -142,7 +142,7 @@
         F funct,
 #endif
         typename enable_if<
-        typename is_same<typename result_of<F>::type, std::size_t>::type, dummy*
+        typename is_same<typename result_of<F>::type, unsigned int>::type, dummy*
         >::type=0
     )
     : m_count(check(count)),
@@ -165,7 +165,7 @@
       )
     {
     }
-    barrier(unsigned int count, std::size_t(*funct)()) :
+    barrier(unsigned int count, unsigned int(*funct)()) :
       m_count(check(count)), m_generation(0),
       fct_(funct
           ? thread_detail::size_completion_function(funct)

Modified: trunk/libs/thread/test/test_barrier_size_fct.cpp
==============================================================================
--- trunk/libs/thread/test/test_barrier_size_fct.cpp	Thu Jul  4 11:31:32 2013	(r84951)
+++ trunk/libs/thread/test/test_barrier_size_fct.cpp	2013-07-04 17:38:33 EDT (Thu, 04 Jul 2013)	(r84952)
@@ -20,7 +20,7 @@
 long global_parameter;
 const int N_THREADS=3;
 
-std::size_t size_fct() {
+unsigned int size_fct() {
   global_parameter++;
   return N_THREADS;
 }