mirror of https://github.com/bitcoin/bitcoin
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.4 KiB
38 lines
1.4 KiB
10 years ago
|
From eec808554936ae068b23df07ab54d4dc6302a695 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jzmaddock <jzmaddock@gmail.com>
|
||
|
|
Date: Sat, 23 Aug 2014 09:38:02 +0100
|
||
|
|
Subject: [PATCH] Fix BOOST_NO_CXX11_VARIADIC_TEMPLATES definition - the
|
||
|
|
feature was introduced in GCC 4.4.
|
||
|
|
|
||
|
|
---
|
||
|
|
include/boost/config/compiler/gcc.hpp | 9 +--------
|
||
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
|
||
|
|
index f37159d..97d8a18 100644
|
||
|
|
--- a/include/boost/config/compiler/gcc.hpp
|
||
|
|
+++ b/include/boost/config/compiler/gcc.hpp
|
||
|
|
@@ -154,14 +154,6 @@
|
||
|
|
# define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
|
||
|
|
# define BOOST_NO_CXX11_RVALUE_REFERENCES
|
||
|
|
# define BOOST_NO_CXX11_STATIC_ASSERT
|
||
|
|
-
|
||
|
|
-// Variadic templates compiler:
|
||
|
|
-// http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
|
||
|
|
-# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
|
||
|
|
-# define BOOST_HAS_VARIADIC_TMPL
|
||
|
|
-# else
|
||
|
|
-# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||
|
|
-# endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// C++0x features in 4.4.n and later
|
||
|
|
@@ -176,6 +168,7 @@
|
||
|
|
# define BOOST_NO_CXX11_DELETED_FUNCTIONS
|
||
|
|
# define BOOST_NO_CXX11_TRAILING_RESULT_TYPES
|
||
|
|
# define BOOST_NO_CXX11_INLINE_NAMESPACES
|
||
|
|
+# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|