Tested x86_64-linux, pushed to trunk.
-- >8 --
libstdc++-v3/ChangeLog:
* testsuite/20_util/optional/monadic/and_then.cc: Fix typo.
* testsuite/20_util/optional/monadic/transform.cc: Likewise.
* testsuite/22_locale/codecvt/always_noconv/char/1.cc: Likewise.
* testsuite/22_locale/codecvt/encoding/char/1.cc: Likewise.
* testsuite/22_locale/codecvt/in/char/1.cc: Likewise.
* testsuite/22_locale/codecvt/max_length/char/1.cc: Likewise.
* testsuite/22_locale/codecvt/out/char/1.cc: Likewise.
* testsuite/22_locale/codecvt/unshift/char/1.cc: Likewise.
---
.../testsuite/20_util/optional/monadic/and_then.cc | 2 +-
.../testsuite/20_util/optional/monadic/transform.cc | 2 +-
.../22_locale/codecvt/always_noconv/char/1.cc | 4 ++--
.../testsuite/22_locale/codecvt/encoding/char/1.cc | 4 ++--
.../testsuite/22_locale/codecvt/in/char/1.cc | 8 ++++----
.../testsuite/22_locale/codecvt/max_length/char/1.cc | 4 ++--
.../testsuite/22_locale/codecvt/out/char/1.cc | 8 ++++----
.../testsuite/22_locale/codecvt/unshift/char/1.cc | 12 ++++++------
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
index f69ab952643..7cbec330ea0 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/and_then.cc
@@ -118,7 +118,7 @@ void f(int&) { }
void
test_unconstrained()
{
- // PR libstc++/102863 - Optional monadic ops should not be constrained
+ // PR libstdc++/102863 - Optional monadic ops should not be constrained
std::optional<int> x;
auto answer = x.and_then([](auto& y) { f(y); return std::optional<int>{42};
});
VERIFY( !answer );
diff --git a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
index 356c94de6d0..b08837ee03b 100644
--- a/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
+++ b/libstdc++-v3/testsuite/20_util/optional/monadic/transform.cc
@@ -137,7 +137,7 @@ void f(int&) { }
void
test_unconstrained()
{
- // PR libstc++/102863 - Optional monadic ops should not be constrained
+ // PR libstdc++/102863 - Optional monadic ops should not be constrained
std::optional<int> x;
auto answer = x.transform([](auto& y) { f(y); return 42; });
VERIFY( !answer );
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc
index 9431c90b10e..c169073fb46 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/1.cc
@@ -36,9 +36,9 @@ void test01()
char* c_ref = new char[size];
locale loc = locale::classic();
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc
index a8e86524e06..f5e0541a879 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/1.cc
@@ -36,9 +36,9 @@ void test01()
char* c_ref = new char[size];
locale loc = locale::classic();
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc
index 42bb7bc8578..299c62a8cc6 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/1.cc
@@ -40,19 +40,19 @@ void test01()
locale loc = locale::classic();
c_codecvt::state_type state;
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
// in
memset(c_arr, 'X', size);
- result r1 = cvt->in(state, c_lit, c_lit + size, from_next,
+ result r1 = cvt->in(state, c_lit, c_lit + size, from_next,
c_arr, c_arr + size, to_next);
VERIFY( r1 == codecvt_base::noconv );
- VERIFY( !memcmp(c_arr, c_ref, size) );
+ VERIFY( !memcmp(c_arr, c_ref, size) );
VERIFY( from_next == c_lit );
VERIFY( to_next == c_arr );
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc
index 0236ac35293..5aec13726da 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/1.cc
@@ -35,9 +35,9 @@ void test01()
char* c_arr = new char[size];
char* c_ref = new char[size];
locale loc = locale::classic();
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc
index 5733df674aa..a2224c71e54 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/1.cc
@@ -40,19 +40,19 @@ void test01()
locale loc = locale::classic();
c_codecvt::state_type state;
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
// out
memset(c_arr, 'X', size);
- result r2 = cvt->out(state, c_lit, c_lit + size, from_next,
+ result r2 = cvt->out(state, c_lit, c_lit + size, from_next,
c_arr, c_arr + size, to_next);
VERIFY( r2 == codecvt_base::noconv );
- VERIFY( !memcmp(c_arr, c_ref, size) );
+ VERIFY( !memcmp(c_arr, c_ref, size) );
VERIFY( from_next == c_lit );
VERIFY( to_next == c_arr );
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc
index 828fcec46d3..28745ce9eed 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc
@@ -40,28 +40,28 @@ void test01()
locale loc = locale::classic();
c_codecvt::state_type state;
- const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
+ const c_codecvt* cvt = &use_facet<c_codecvt>(loc);
- // According to the resolution of DR19 (see also libstd++/9168), in
+ // According to the resolution of DR19 (see also libstdc++/9168), in
// case of degenerate conversion ('noconv'), "there are no changes to
// the values in [to, to_limit)."
memset(c_ref, 'X', size);
// in
memset(c_arr, 'X', size);
- result r1 = cvt->in(state, c_lit, c_lit + size, from_next,
+ result r1 = cvt->in(state, c_lit, c_lit + size, from_next,
c_arr, c_arr + size, to_next);
VERIFY( r1 == codecvt_base::noconv );
- VERIFY( !memcmp(c_arr, c_ref, size) );
+ VERIFY( !memcmp(c_arr, c_ref, size) );
VERIFY( from_next == c_lit );
VERIFY( to_next == c_arr );
// out
memset(c_arr, 'X', size);
- result r2 = cvt->out(state, c_lit, c_lit + size, from_next,
+ result r2 = cvt->out(state, c_lit, c_lit + size, from_next,
c_arr, c_arr + size, to_next);
VERIFY( r2 == codecvt_base::noconv );
- VERIFY( !memcmp(c_arr, c_ref, size) );
+ VERIFY( !memcmp(c_arr, c_ref, size) );
VERIFY( from_next == c_lit );
VERIFY( to_next == c_arr );
--
2.34.1
