diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-11 18:43:21 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-11 18:43:21 +0000 |
| commit | 5a1d3b3dd0a3426033332235c01db758a90c8e9d (patch) | |
| tree | 8e73fb538c56a1b7cb0cb34396d26da7a0e704b4 /devel | |
| parent | 919bf169e21ae2480f040cea92abe9a2ae88cd80 (diff) | |
| download | ports-5a1d3b3dd0a3426033332235c01db758a90c8e9d.tar.gz ports-5a1d3b3dd0a3426033332235c01db758a90c8e9d.zip | |
devel/boost-libs: Fix bad c++11 so it builds with gcc5
PR: 197594
Submitted by: marino
Approved by: maintainer timeout
Notes
Notes:
svn path=/head/; revision=381028
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/boost-libs/files/patch-boost_thread_pthread_once.hpp | 29 | ||||
| -rw-r--r-- | devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp | 11 |
2 files changed, 40 insertions, 0 deletions
diff --git a/devel/boost-libs/files/patch-boost_thread_pthread_once.hpp b/devel/boost-libs/files/patch-boost_thread_pthread_once.hpp new file mode 100644 index 000000000000..fdc9bccc3e62 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_thread_pthread_once.hpp @@ -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> diff --git a/devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp b/devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp new file mode 100644 index 000000000000..ed9d46ccbf57 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_thread_pthread_once__atomic.hpp @@ -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) |