From 0564cdb94a7a1facbb0dbf888ceb90638aa70ecd Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 18 Dec 2017 20:12:08 +0000 Subject: Vendor import of libc++ trunk r321017: https://llvm.org/svn/llvm-project/libcxx/trunk@321017 --- .../strings/basic.string/string.cons/move_assign_noexcept.pass.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp') diff --git a/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp index 136a60fe627b..0720543420a8 100644 --- a/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp +++ b/test/std/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp @@ -16,7 +16,7 @@ // allocator_traits::propagate_on_container_move_assignment::value || // allocator_traits::is_always_equal::value); // C++17 // -// before C++17, we use the conforming extension +// before C++17, we use the conforming extension // noexcept( // allocator_type::propagate_on_container_move_assignment::value && // is_nothrow_move_assignable::value); @@ -81,12 +81,12 @@ int main() } #if TEST_STD_VER > 14 { - // POCMA is false, always equal + // POCMA is false, always equal typedef std::basic_string, some_alloc2> C; static_assert( std::is_nothrow_move_assignable::value, ""); } { - // POCMA is false, not always equal + // POCMA is false, not always equal typedef std::basic_string, some_alloc3> C; static_assert(!std::is_nothrow_move_assignable::value, ""); } -- cgit v1.3