[Boost-commit] svn:boost r85462 - trunk/boost/thread

Subject: [Boost-commit] svn:boost r85462 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-08-25 11:08:08

Author: viboes
Date: 2013-08-25 11:08:08 EDT (Sun, 25 Aug 2013)
New Revision: 85462
URL: http://svn.boost.org/trac/boost/changeset/85462

Log:
Thread: rename check by cgeck_counter to avoid conflict with macro.

Text files modified: 
   trunk/boost/thread/barrier.hpp |    15 ++++++++-------                         
   1 files changed, 8 insertions(+), 7 deletions(-)

Modified: trunk/boost/thread/barrier.hpp
==============================================================================
--- trunk/boost/thread/barrier.hpp	Sun Aug 25 10:20:22 2013	(r85461)
+++ trunk/boost/thread/barrier.hpp	2013-08-25 11:08:08 EDT (Sun, 25 Aug 2013)	(r85462)
@@ -57,7 +57,8 @@
     struct void_functor_barrier_reseter
     {
       unsigned int size_;
-      void_completion_function fct_;template <typename F>
+      void_completion_function fct_;
+      template <typename F>
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
       void_functor_barrier_reseter(unsigned int size, BOOST_THREAD_RV_REF(F) funct)
       : size_(size), fct_(boost::move(funct))
@@ -90,7 +91,7 @@
   }
   class barrier
   {
-    static inline unsigned int check(unsigned int count)
+    static inline unsigned int check_counter(unsigned int count)
     {
       if (count == 0) boost::throw_exception(
           thread_exception(system::errc::invalid_argument, "barrier constructor: count cannot be zero."));
@@ -104,7 +105,7 @@
     BOOST_THREAD_NO_COPYABLE( barrier)
 
     explicit barrier(unsigned int count) :
-      m_count(check(count)), m_generation(0), fct_(thread_detail::default_barrier_reseter(count))
+      m_count(check_counter(count)), m_generation(0), fct_(thread_detail::default_barrier_reseter(count))
     {
     }
 
@@ -120,7 +121,7 @@
         typename is_void<typename result_of<F>::type>::type, dummy*
         >::type=0
     )
-    : m_count(check(count)),
+    : m_count(check_counter(count)),
     m_generation(0),
     fct_(thread_detail::void_functor_barrier_reseter(count,
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
@@ -145,7 +146,7 @@
         typename is_same<typename result_of<F>::type, unsigned int>::type, dummy*
         >::type=0
     )
-    : m_count(check(count)),
+    : m_count(check_counter(count)),
     m_generation(0),
     fct_(
 #ifndef BOOST_NO_CXX11_HDR_FUNCTIONAL
@@ -158,7 +159,7 @@
     }
 
     barrier(unsigned int count, void(*funct)()) :
-      m_count(check(count)), m_generation(0),
+      m_count(check_counter(count)), m_generation(0),
       fct_(funct
           ? thread_detail::size_completion_function(thread_detail::void_fct_ptr_barrier_reseter(count, funct))
           : thread_detail::size_completion_function(thread_detail::default_barrier_reseter(count))
@@ -166,7 +167,7 @@
     {
     }
     barrier(unsigned int count, unsigned int(*funct)()) :
-      m_count(check(count)), m_generation(0),
+      m_count(check_counter(count)), m_generation(0),
       fct_(funct
           ? thread_detail::size_completion_function(funct)
           : thread_detail::size_completion_function(thread_detail::default_barrier_reseter(count))