diff options
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algobase.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/copy/58982.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/copy_n/58982.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index a76b00b..d001b5f 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -424,7 +424,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION is_move_assignable<_Tp>, is_copy_assignable<_Tp>>; // trivial types can have deleted assignment - static_assert( __assignable::type::value, "type is not assignable" ); + static_assert( __assignable::type::value, "type must be assignable" ); #endif const ptrdiff_t _Num = __last - __first; if (_Num) @@ -735,7 +735,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER is_move_assignable<_Tp>, is_copy_assignable<_Tp>>; // trivial types can have deleted assignment - static_assert( __assignable::type::value, "type is not assignable" ); + static_assert( __assignable::type::value, "type must be assignable" ); #endif const ptrdiff_t _Num = __last - __first; if (_Num) diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/58982.cc b/libstdc++-v3/testsuite/25_algorithms/copy/58982.cc index f47bf9f..151a7e2 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/58982.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/58982.cc @@ -38,5 +38,5 @@ test01(T* result) T t[1]; std::copy(t, t+1, result); // { dg-error "here|deleted" } } -// { dg-prune-output "not assignable" } +// { dg-prune-output "type must be assignable" } // { dg-prune-output "use of deleted" } diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/58982.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/58982.cc index 133a2e2..5ddc8cc 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy_n/58982.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/58982.cc @@ -38,5 +38,5 @@ test01(T* result) T t[1]; std::copy_n(t, 1, result); // { dg-error "here|deleted" } } -// { dg-prune-output "not assignable" } +// { dg-prune-output "type must be assignable" } // { dg-prune-output "use of deleted" } |