Configure to get along with 2.9 clang

Howard Hinnant · Howard Hinnant · commit 89bdcd7ef54b · 2011-07-29T21:35:53.000Z
llvm-svn: 136526
diff --git a/libcxx/include/__config b/libcxx/include/__config
@@ -146,6 +146,9 @@ typedef __char32_t char32_t;
 
 #if !(__has_feature(cxx_auto_type))
 #define _LIBCPP_HAS_NO_AUTO_TYPE
+#endif
+
+#if __clang_major__ < 3
 #define _LIBCPP_HAS_NO_ADVANCED_SFINAE
 #endif
 
diff --git a/libcxx/include/memory b/libcxx/include/memory
@@ -1294,7 +1294,7 @@ struct __has_allocate_hint
 
 #endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
 
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
+#if !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE) && !defined(_LIBCPP_HAS_NO_VARIADICS)
 
 template <class _Alloc, class _Tp, class ..._Args>
 decltype(_VSTD::declval<_Alloc>().construct(_VSTD::declval<_Tp*>(),
diff --git a/libcxx/src/exception.cpp b/libcxx/src/exception.cpp
@@ -56,6 +56,7 @@ std::get_terminate() _NOEXCEPT
     return __sync_fetch_and_add(&__terminate_handler, (std::terminate_handler)0);
 }
 
+_ATTRIBUTE(noreturn)
 void
 std::terminate() _NOEXCEPT
 {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ std::get_terminate() _NOEXCEPT`
`56`	`56`	`return __sync_fetch_and_add(&__terminate_handler, (std::terminate_handler)0);`
`57`	`57`	`}`
`58`	`58`
	`59`	`+_ATTRIBUTE(noreturn)`
`59`	`60`	`void`
`60`	`61`	`std::terminate() _NOEXCEPT`
`61`	`62`	`{`