From 5fd26e13da30e2cec5dfdf41a143752a47d8cc75 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 2 Nov 2016 05:08:58 +0000
Subject: [PATCH] Fix GCC test failure caused by manually defining
 _LIBCPP_HAS_NO_VARIADICS

llvm-svn: 285788
---
 libcxx/include/type_traits | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits
index a1ed198..4d24886 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/include/type_traits
@@ -520,7 +520,7 @@ using bool_constant = integral_constant<bool, __b>;
 typedef _LIBCPP_BOOL_CONSTANT(true)  true_type;
 typedef _LIBCPP_BOOL_CONSTANT(false) false_type;
 
-#if !defined(_LIBCPP_HAS_NO_VARIADICS)
+#if !defined(_LIBCPP_CXX03_LANG)
 
 // __lazy_and
 
@@ -595,7 +595,7 @@ struct __or_<_B0, _B1, _B2, _Bn...>
 template<class _Tp> 
 struct __not_ : conditional<_Tp::value, false_type, true_type>::type {};
 
-#endif // !defined(_LIBCPP_HAS_NO_VARIADICS)
+#endif // !defined(_LIBCPP_CXX03_LANG)
 
 // is_const
 
-- 
2.7.4