More N4258 changes. This time vector's constructors

llvm-svn: 238990

2 files changed, 25 insertions, 3 deletions

diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index 75772bef78a..9d757bf576a 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
@@ -9,7 +9,8 @@
 
 // <vector>
 
-// vector(const Alloc& = Alloc());
+// vector();
+// vector(const Alloc&);
 
 #include <vector>
 #include <cassert>
@@ -24,12 +25,17 @@ template <class C>
 void
 test0()
 {
+#if TEST_STD_VER > 14
+	static_assert((noexcept(C{})), "" );
+#elif TEST_STD_VER >= 11
+	static_assert((noexcept(C()) == noexcept(typename C::allocator_type())), "" );
+#endif
     C c;
     assert(c.__invariants());
     assert(c.empty());
     assert(c.get_allocator() == typename C::allocator_type());
     assert(is_contiguous_container_asan_correct(c)); 
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     C c1 = {};
     assert(c1.__invariants());
     assert(c1.empty());
@@ -42,6 +48,11 @@ template <class C>
 void
 test1(const typename C::allocator_type& a)
 {
+#if TEST_STD_VER > 14
+	static_assert((noexcept(C{typename C::allocator_type{}})), "" );
+#elif TEST_STD_VER >= 11
+	static_assert((noexcept(C(typename C::allocator_type())) == std::is_nothrow_copy_constructible<typename C::allocator_type>::value), "" );
+#endif
     C c(a);
     assert(c.__invariants());
     assert(c.empty());
@@ -62,7 +73,7 @@ int main()
         std::vector<int, stack_allocator<int, 10> > v;
         assert(v.empty());
     }
-#if __cplusplus >= 201103L
+#if TEST_STD_VER >= 11
     {
     test0<std::vector<int, min_allocator<int>> >();
     test0<std::vector<NotConstructible, min_allocator<NotConstructible>> >();
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
index 471c1d407ec..e13a5fc0d35 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
@@ -17,6 +17,7 @@
 #include <vector>
 #include <cassert>
 
+#include "test_macros.h"
 #include "MoveOnly.h"
 #include "test_allocator.h"
 
@@ -40,11 +41,21 @@ int main()
     }
     {
         typedef std::vector<MoveOnly, other_allocator<MoveOnly>> C;
+// See N4258 - vector<T, Allocator>::basic_string() noexcept;
+#if TEST_STD_VER <= 14
         static_assert(!std::is_nothrow_default_constructible<C>::value, "");
+#else
+        static_assert( std::is_nothrow_default_constructible<C>::value, "");
+#endif
     }
     {
         typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
+// See N4258 - vector<T, Allocator>::basic_string() noexcept;
+#if TEST_STD_VER <= 14
         static_assert(!std::is_nothrow_default_constructible<C>::value, "");
+#else
+        static_assert( std::is_nothrow_default_constructible<C>::value, "");
+#endif
     }
 #endif
 }