Ticket #10125: call_once_variadic.patch

File call_once_variadic.patch, 2.6 KB (added by raad@…, 8 years ago)

  • include/boost/thread/pthread/once.hpp 

     include/boost/thread/pthread/once.hpp        | 6 +++---
 include/boost/thread/pthread/once_atomic.hpp | 2 +-
 include/boost/thread/win32/once.hpp          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/boost/thread/pthread/once.hpp b/include/boost/thread/pthread/once.hpp
index ccfb051..0bef038 100644
    a b namespace boost  
    4242  }
    4343
    4444#ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
    45 #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     45#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
    4646    template<typename Function, class ...ArgTypes>
    4747    inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
    4848#else
    … … namespace boost  
    6565  private:
    6666      volatile thread_detail::uintmax_atomic_t epoch;
    6767
    68 #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     68#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
    6969      template<typename Function, class ...ArgTypes>
    7070      friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
    7171#else
    … … namespace boost  
    118118    // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
    119119
    120120
    121 #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     121#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
    122122
    123123
    124124  template<typename Function, class ...ArgTypes>

  • include/boost/thread/pthread/once_atomic.hpp 

    diff --git a/include/boost/thread/pthread/once_atomic.hpp b/include/boost/thread/pthread/once_atomic.hpp
index 9e2f876..923f07b 100644
    a b namespace boost  
    115115#endif
    116116
    117117
    118 #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     118#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
    119119
    120120  template<typename Function, class ...ArgTypes>
    121121  inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)

  • include/boost/thread/win32/once.hpp 

    diff --git a/include/boost/thread/win32/once.hpp b/include/boost/thread/win32/once.hpp
index cafcfd4..9b37b31 100644
    a b namespace boost  
    227227        }
    228228    }
    229229
    230 #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     230#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
    231231//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
    232232    inline void call_once(once_flag& flag, void (*f)())
    233233    {