From 628fbc53bd60d6b0e518aee1c4aa038c512f439a Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 16 Apr 2009 17:34:46 +0000
Subject: [PATCH] Merged revisions 52381 via svnmerge from
 https://svn.boost.org/svn/boost/trunk

........
  r52381 | danieljames | 2009-04-14 10:03:13 +0100 (Tue, 14 Apr 2009) | 1 line

  Fix variadic template detection for mainline gcc. Fixes #2943
........


[SVN r52423]
---
 include/boost/config/compiler/gcc.hpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index 439153ce..62bf45e6 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -125,10 +125,19 @@
 #  define BOOST_HAS_DECLTYPE
 #  define BOOST_HAS_RVALUE_REFS
 #  define BOOST_HAS_STATIC_ASSERT
+#  define BOOST_HAS_VARIADIC_TMPL
 #else
 #  define BOOST_NO_DECLTYPE
 #  define BOOST_NO_RVALUE_REFERENCES
 #  define BOOST_NO_STATIC_ASSERT
+
+// Variadic templates compiler: 
+//   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
+#  ifdef __VARIADIC_TEMPLATES
+#    define BOOST_HAS_VARIADIC_TMPL
+#  else
+#    define BOOST_NO_VARIADIC_TEMPLATES
+#  endif
 #endif
 
 #if !defined(__GXX_EXPERIMENTAL_CXX0X__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)
@@ -136,14 +145,6 @@
 #  define BOOST_NO_AUTO_DECLARATIONS
 #endif
 
-// Variadic templates compiler: 
-//   http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
-#ifdef __VARIADIC_TEMPLATES
-#  define BOOST_HAS_VARIADIC_TMPL
-#else
-#  define BOOST_NO_VARIADIC_TEMPLATES
-#endif
-
 // ConceptGCC compiler:
 //   http://www.generic-programming.org/software/ConceptGCC/
 #ifdef __GXX_CONCEPTS__