Implement LWG 2946, 3075 and 3076. Reviewed as https://reviews.llvm.org/D48616
llvm-svn: 336132
diff --git a/libcxx/include/memory b/libcxx/include/memory
index 021bd13..31d4e4f 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -5638,15 +5638,15 @@
};
#endif
-#if _LIBCPP_STD_VER > 14
-template<typename _Alloc, typename = void>
+template<typename _Alloc, typename = void, typename = void>
struct __is_allocator : false_type {};
template<typename _Alloc>
struct __is_allocator<_Alloc,
- void_t<typename _Alloc::value_type, decltype(_VSTD::declval<_Alloc&>().allocate(size_t{}))>>
+ typename __void_t<typename _Alloc::value_type>::type,
+ typename __void_t<decltype(_VSTD::declval<_Alloc&>().allocate(size_t(0)))>::type
+ >
: true_type {};
-#endif
_LIBCPP_END_NAMESPACE_STD