Attachment 153273 Details for Bug 197594 – patch to allow boost-libs 1.55 to build on gcc-5

[patch] patch to allow boost-libs 1.55 to build on gcc-5

fix-boost.patch (text/plain), 2.30 KB, created by John Marino on 2015-02-21 15:29:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Marino

Created: 2015-02-21 15:29:32 UTC

Size: 2.30 KB

patch

obsolete

>Index: devel/boost-libs/files/patch-boost_thread_pthread_once.hpp
>===================================================================
>--- devel/boost-libs/files/patch-boost_thread_pthread_once.hpp	(revision 0)
>+++ devel/boost-libs/files/patch-boost_thread_pthread_once.hpp	(working copy)
>@@ -0,0 +1,29 @@
>+--- boost/thread/pthread/once.hpp.orig	2013-03-23 01:48:21 UTC
>++++ boost/thread/pthread/once.hpp
>+@@ -42,7 +42,7 @@ namespace boost
>+   }
>+ 
>+ #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
>+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
>++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) 
>+     template<typename Function, class ...ArgTypes>
>+     inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
>+ #else
>+@@ -65,7 +65,7 @@ namespace boost
>+   private:
>+       volatile thread_detail::uintmax_atomic_t epoch;
>+ 
>+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
>++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
>+       template<typename Function, class ...ArgTypes>
>+       friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
>+ #else
>+@@ -118,7 +118,7 @@ namespace boost
>+     // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
>+ 
>+ 
>+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
>++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
>+ 
>+ 
>+   template<typename Function, class ...ArgTypes>
>Index: devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp
>===================================================================
>--- devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp	(revision 0)
>+++ devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- boost/thread/pthread/once_atomic.hpp.orig	2013-03-23 01:48:21 UTC
>++++ boost/thread/pthread/once_atomic.hpp
>+@@ -115,7 +115,7 @@ namespace boost
>+ #endif
>+ 
>+ 
>+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
>++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
>+ 
>+   template<typename Function, class ...ArgTypes>
>+   inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)

Actions: View | Diff

Attachments on bug 197594: 153273