aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2021-04-06 16:34:48 +0100
committerJonathan Wakely <jwakely@redhat.com>2021-04-06 16:43:24 +0100
commit41019bfae2673a818a9b7d08742f3ef91c0deade (patch)
treec0e07174f94efd2c9a52c3a6106deca608bfd93b
parentdaef4e4d934716b933fa445a0ec6650aeb642751 (diff)
downloadgcc-41019bfae2673a818a9b7d08742f3ef91c0deade.zip
gcc-41019bfae2673a818a9b7d08742f3ef91c0deade.tar.gz
gcc-41019bfae2673a818a9b7d08742f3ef91c0deade.tar.bz2
libstdc++: Clarify static_assert message
libstdc++-v3/ChangeLog: * include/bits/move.h (forward): Change static_assert message to be unambiguous about what must be true. * testsuite/20_util/forward/c_neg.cc: Adjust dg-error. * testsuite/20_util/forward/f_neg.cc: Likewise.
-rw-r--r--libstdc++-v3/include/bits/move.h2
-rw-r--r--libstdc++-v3/testsuite/20_util/forward/c_neg.cc2
-rw-r--r--libstdc++-v3/testsuite/20_util/forward/f_neg.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h
index d36e4b2..feacae0 100644
--- a/libstdc++-v3/include/bits/move.h
+++ b/libstdc++-v3/include/bits/move.h
@@ -87,7 +87,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
forward(typename std::remove_reference<_Tp>::type&& __t) noexcept
{
static_assert(!std::is_lvalue_reference<_Tp>::value, "template argument"
- " substituting _Tp is an lvalue reference type");
+ " substituting _Tp must not be an lvalue reference type");
return static_cast<_Tp&&>(__t);
}
diff --git a/libstdc++-v3/testsuite/20_util/forward/c_neg.cc b/libstdc++-v3/testsuite/20_util/forward/c_neg.cc
index 884100d..dc7ec51 100644
--- a/libstdc++-v3/testsuite/20_util/forward/c_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/c_neg.cc
@@ -17,7 +17,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-error "static assertion failed" "" { target *-*-* } 89 }
+// { dg-error "must not be an lvalue reference" "" { target *-*-* } 0 }
#include <list>
diff --git a/libstdc++-v3/testsuite/20_util/forward/f_neg.cc b/libstdc++-v3/testsuite/20_util/forward/f_neg.cc
index 90d3152..4ccd726 100644
--- a/libstdc++-v3/testsuite/20_util/forward/f_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/forward/f_neg.cc
@@ -17,7 +17,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-error "static assertion failed" "" { target *-*-* } 89 }
+// { dg-error "must not be an lvalue reference" "" { target *-*-* } 0 }
#include <utility>