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 f69ab952643f9df1aa84f3d02b4e3e0874d8dd43..7cbec330ea007d265e14cd77e6c98847331b607a 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 356c94de6d090a250dc2aa8913a945fbdd1efb1e..b08837ee03b4a1ae9d153003e670ec0bbb8cbf3a 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 9431c90b10eac7f5bb64293ad86482ed7d4ef711..c169073fb46a29f1d67b0ba95529a94e6d2c579c 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 a8e86524e068ecb21582693320ef5012bcfd83d5..f5e0541a879bb0965f1813e5f9e2c3dc5eea822b 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 42bb7bc8578c51ba1da2fb6e381be8ba39545cf9..299c62a8cc6c3c54e105aebe5eace72892f9485d 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 0236ac35293ebb39967be60a8429fa8653998c77..5aec13726da5c46ee1d89ce25bdf4604bd56404e 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 5733df674aad0c9fae2be32bc5fb53046b4d89f3..a2224c71e5468fcc05149fac8973d8aac381c952 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 828fcec46d37bb329fdb03a4a311dab0a58e88a4..28745ce9eed75d0ebe588d49082e7b4237e71227 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 );