Tested x86_64-pc-linux-gnu, OK for trunk?
-- 8< --
Quite a few tests #include <c...> headers but then expect the names to be
declared in the global namespace. This is often true for the headers, but
doesn't work with module std.
libstdc++-v3/ChangeLog
* testsuite/20_util/align/1.cc
* testsuite/20_util/duration/arithmetic/dr3050.cc
* testsuite/20_util/duration/cons/dr3050.cc
* testsuite/20_util/from_chars/7.cc
* testsuite/20_util/shared_ptr/creation/dr402.cc
* testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
* testsuite/21_strings/basic_string/operations/compare/char/1.cc
* testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
*
testsuite/21_strings/basic_string_view/operations/compare/char/70483.cc
* testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
* testsuite/21_strings/c_strings/wchar_t/3_neg.cc
* testsuite/21_strings/char_traits/requirements/wchar_t/typedefs.cc
* testsuite/22_locale/codecvt/requirements/base_classes.cc
* testsuite/22_locale/codecvt/requirements/typedefs.cc
* testsuite/22_locale/codecvt_byname/requirements/base_classes.cc
*
testsuite/22_locale/codecvt_byname/requirements/explicit_instantiation.cc
* testsuite/22_locale/codecvt_byname/requirements/typedefs.cc
* testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
* testsuite/22_locale/conversions/string/requirements/typedefs.cc
* testsuite/22_locale/locale/cons/12438.cc
* testsuite/23_containers/list/pthread1.cc
* testsuite/23_containers/list/pthread5.cc
* testsuite/23_containers/span/deduction.cc
* testsuite/23_containers/span/everything.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/base_copy.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/base_move.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/copy.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/default.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/seed1.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/seed2.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq.cc
* testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq2.cc
*
testsuite/26_numerics/random/independent_bits_engine/operators/equal.cc
*
testsuite/26_numerics/random/independent_bits_engine/operators/inequal.cc
*
testsuite/26_numerics/random/independent_bits_engine/operators/serialize.cc
*
testsuite/26_numerics/random/independent_bits_engine/requirements/typedefs.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/base_copy.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/base_move.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/copy.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/default.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/seed1.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/seed2.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq.cc
* testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq2.cc
* testsuite/26_numerics/random/shuffle_order_engine/operators/equal.cc
* testsuite/26_numerics/random/shuffle_order_engine/operators/inequal.cc
*
testsuite/26_numerics/random/shuffle_order_engine/operators/serialize.cc
*
testsuite/26_numerics/random/shuffle_order_engine/requirements/typedefs.cc
*
testsuite/26_numerics/random/subtract_with_carry_engine/cons/lwg3809.cc
* testsuite/27_io/basic_filebuf/overflow/char/9169.cc
* testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
* testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
* testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
* testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
* testsuite/27_io/filesystem/path/construct/format.cc
* testsuite/27_io/ios_base/storage/11584.cc
* testsuite/27_io/objects/wchar_t/12048-4.cc
* testsuite/29_atomics/atomic/wait_notify/100334.cc
* testsuite/30_threads/condition_variable_any/cond.cc
* testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
* testsuite/30_threads/semaphore/100806.cc
* testsuite/std/ranges/access/p2602.cc: Add missing std::.
---
libstdc++-v3/testsuite/20_util/align/1.cc | 2 +-
.../20_util/duration/arithmetic/dr3050.cc | 2 +-
.../testsuite/20_util/duration/cons/dr3050.cc | 2 +-
.../testsuite/20_util/from_chars/7.cc | 4 +-
.../20_util/shared_ptr/creation/dr402.cc | 4 +-
.../memory_management_tools/1.cc | 52 +++++++++----------
.../basic_string/operations/compare/char/1.cc | 18 +++----
.../operations/compare/char/1.cc | 18 +++----
.../operations/compare/char/70483.cc | 6 +--
.../operations/compare/wchar_t/1.cc | 18 +++----
.../21_strings/c_strings/wchar_t/3_neg.cc | 40 +++++++-------
.../requirements/wchar_t/typedefs.cc | 2 +-
.../codecvt/requirements/base_classes.cc | 2 +-
.../codecvt/requirements/typedefs.cc | 2 +-
.../requirements/base_classes.cc | 4 +-
.../requirements/explicit_instantiation.cc | 2 +-
.../codecvt_byname/requirements/typedefs.cc | 2 +-
.../buffer/requirements/typedefs.cc | 2 +-
.../string/requirements/typedefs.cc | 2 +-
.../testsuite/22_locale/locale/cons/12438.cc | 2 +-
.../testsuite/23_containers/list/pthread1.cc | 2 +-
.../testsuite/23_containers/list/pthread5.cc | 8 +--
.../testsuite/23_containers/span/deduction.cc | 2 +-
.../23_containers/span/everything.cc | 2 +-
.../independent_bits_engine/cons/base_copy.cc | 4 +-
.../independent_bits_engine/cons/base_move.cc | 4 +-
.../independent_bits_engine/cons/copy.cc | 4 +-
.../independent_bits_engine/cons/default.cc | 4 +-
.../independent_bits_engine/cons/seed1.cc | 4 +-
.../independent_bits_engine/cons/seed2.cc | 4 +-
.../independent_bits_engine/cons/seed_seq.cc | 4 +-
.../independent_bits_engine/cons/seed_seq2.cc | 4 +-
.../operators/equal.cc | 4 +-
.../operators/inequal.cc | 4 +-
.../operators/serialize.cc | 4 +-
.../requirements/typedefs.cc | 4 +-
.../shuffle_order_engine/cons/base_copy.cc | 2 +-
.../shuffle_order_engine/cons/base_move.cc | 2 +-
.../random/shuffle_order_engine/cons/copy.cc | 2 +-
.../shuffle_order_engine/cons/default.cc | 2 +-
.../random/shuffle_order_engine/cons/seed1.cc | 2 +-
.../random/shuffle_order_engine/cons/seed2.cc | 2 +-
.../shuffle_order_engine/cons/seed_seq.cc | 2 +-
.../shuffle_order_engine/cons/seed_seq2.cc | 2 +-
.../shuffle_order_engine/operators/equal.cc | 2 +-
.../shuffle_order_engine/operators/inequal.cc | 2 +-
.../operators/serialize.cc | 2 +-
.../requirements/typedefs.cc | 2 +-
.../cons/lwg3809.cc | 6 +--
.../27_io/basic_filebuf/overflow/char/9169.cc | 2 +-
.../basic_filebuf/overflow/char/9182-2.cc | 6 +--
.../seekoff/wchar_t/9875_seekoff.cc | 2 +-
.../seekpos/wchar_t/9875_seekpos.cc | 2 +-
.../27_io/basic_filebuf/sync/char/9182-1.cc | 6 +--
.../underflow/wchar_t/11544-1.cc | 2 +-
.../underflow/wchar_t/11544-2.cc | 2 +-
.../basic_filebuf/underflow/wchar_t/9178.cc | 2 +-
.../27_io/filesystem/path/construct/format.cc | 4 +-
.../testsuite/27_io/ios_base/storage/11584.cc | 4 +-
.../27_io/objects/wchar_t/12048-4.cc | 4 +-
.../29_atomics/atomic/wait_notify/100334.cc | 4 +-
.../30_threads/condition_variable_any/cond.cc | 4 +-
.../recursive_timed_mutex/try_lock_for/2.cc | 2 +-
.../testsuite/30_threads/semaphore/100806.cc | 4 +-
.../testsuite/std/ranges/access/p2602.cc | 4 +-
65 files changed, 166 insertions(+), 166 deletions(-)
diff --git a/libstdc++-v3/testsuite/20_util/align/1.cc
b/libstdc++-v3/testsuite/20_util/align/1.cc
index 51a173a6f08..28594c1caed 100644
--- a/libstdc++-v3/testsuite/20_util/align/1.cc
+++ b/libstdc++-v3/testsuite/20_util/align/1.cc
@@ -43,7 +43,7 @@ test01()
while( void* const r = std::align(alignment, size, ptr, space) )
{
VERIFY( r == ptr );
- uintptr_t p = reinterpret_cast<uintptr_t>(ptr);
+ std::uintptr_t p = reinterpret_cast<std::uintptr_t>(ptr);
VERIFY( p % alignment == 0 );
char* const x = static_cast<char*>(ptr);
VERIFY( size_t(x - old_ptr) == old_space - space );
diff --git a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr3050.cc
b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr3050.cc
index 5223854f9a5..3945ebe04ff 100644
--- a/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr3050.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/arithmetic/dr3050.cc
@@ -19,7 +19,7 @@
#include <chrono>
-struct X { operator int64_t() /* not const */; };
+struct X { operator std::int64_t() /* not const */; };
void test01(std::chrono::seconds s, X x)
{
diff --git a/libstdc++-v3/testsuite/20_util/duration/cons/dr3050.cc
b/libstdc++-v3/testsuite/20_util/duration/cons/dr3050.cc
index 0b0db465d57..c978614b224 100644
--- a/libstdc++-v3/testsuite/20_util/duration/cons/dr3050.cc
+++ b/libstdc++-v3/testsuite/20_util/duration/cons/dr3050.cc
@@ -19,6 +19,6 @@
#include <chrono>
-struct X { operator int64_t() /* not const */; };
+struct X { operator std::int64_t() /* not const */; };
static_assert(!std::is_constructible<std::chrono::seconds, X>::value,
"LWG 3050");
diff --git a/libstdc++-v3/testsuite/20_util/from_chars/7.cc
b/libstdc++-v3/testsuite/20_util/from_chars/7.cc
index 1aa9b230531..2d15cc8b935 100644
--- a/libstdc++-v3/testsuite/20_util/from_chars/7.cc
+++ b/libstdc++-v3/testsuite/20_util/from_chars/7.cc
@@ -129,7 +129,7 @@ test01()
for (auto [input,correct_idx,correct_ec,correct_value] : testcases)
{
double value;
- auto [ptr,ec] = std::from_chars(input, input+strlen(input),
+ auto [ptr,ec] = std::from_chars(input, input+std::strlen(input),
value, std::chars_format::hex);
VERIFY( ptr == input + correct_idx );
VERIFY( ec == correct_ec );
@@ -140,7 +140,7 @@ test01()
else
{
VERIFY( value == correct_value );
- VERIFY( !memcmp(&value, &correct_value, sizeof(double)) );
+ VERIFY( !std::memcmp(&value, &correct_value, sizeof(double)) );
}
}
}
diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
index 20f5db747c7..4e0a97b1a43 100644
--- a/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
+++ b/libstdc++-v3/testsuite/20_util/shared_ptr/creation/dr402.cc
@@ -25,8 +25,8 @@
struct A
{
- void* operator new(size_t n) { return new char[sizeof(A)]; }
- void operator delete(void* p, size_t) { delete (char*)p; }
+ void* operator new(std::size_t n) { return new char[sizeof(A)]; }
+ void operator delete(void* p, std::size_t) { delete (char*)p; }
};
// 20.6.6.2.6 shared_ptr creation [util.smartptr.shared.create]
diff --git
a/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
index 60ebe2e2050..aca4bb61fa7 100644
---
a/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
+++
b/libstdc++-v3/testsuite/20_util/specialized_algorithms/memory_management_tools/1.cc
@@ -97,35 +97,35 @@ void test04()
void test05()
{
del_count = 0;
- DelCount* x = (DelCount*)malloc(sizeof(DelCount));
+ DelCount* x = (DelCount*)std::malloc(sizeof(DelCount));
new (x) DelCount;
std::destroy_at(&x[0]);
VERIFY(del_count == 1);
del_count = 0;
- free(x);
+ std::free(x);
}
void test06()
{
del_count = 0;
- DelCount* x = (DelCount*)malloc(sizeof(DelCount)*10);
+ DelCount* x = (DelCount*)std::malloc(sizeof(DelCount)*10);
for (int i = 0; i < 10; ++i) new (x+i) DelCount;
std::destroy(x, x+10);
VERIFY(del_count == 10);
del_count = 0;
- free(x);
+ std::free(x);
}
void test07()
{
del_count = 0;
- DelCount* x = (DelCount*)malloc(sizeof(DelCount)*10);
+ DelCount* x = (DelCount*)std::malloc(sizeof(DelCount)*10);
for (int i = 0; i < 10; ++i) new (x+i) DelCount;
auto end = std::destroy_n(x, 10);
VERIFY(del_count == 10);
VERIFY( end == x + 10 );
del_count = 0;
- free(x);
+ std::free(x);
}
struct MoveOnly
@@ -140,7 +140,7 @@ void test08()
MoveOnly source[10];
for (int i = 0; i < 10; ++i) source[i].val = i;
FwdIteratorRange<MoveOnly> src(source);
- MoveOnly* target = (MoveOnly*)malloc(sizeof(MoveOnly)*10);
+ MoveOnly* target = (MoveOnly*)std::malloc(sizeof(MoveOnly)*10);
FwdIteratorRange<MoveOnly> tgt(target, target+10);
auto end = std::uninitialized_move(src.begin(), src.end(), tgt.begin());
VERIFY( end == std::next(tgt.begin(), 10) );
@@ -148,7 +148,7 @@ void test08()
for (int i = 0; i < 10; ++i) VERIFY( target[i].val == i );
auto end2 = std::destroy_n(tgt.begin(), 10);
VERIFY( end2 == std::next(tgt.begin(), 10) );
- free(target);
+ std::free(target);
}
void test09()
@@ -156,7 +156,7 @@ void test09()
MoveOnly source[10];
for (int i = 0; i < 10; ++i) source[i].val = i;
FwdIteratorRange<MoveOnly> src(source);
- MoveOnly* target = (MoveOnly*)malloc(sizeof(MoveOnly)*10);
+ MoveOnly* target = (MoveOnly*)std::malloc(sizeof(MoveOnly)*10);
FwdIteratorRange<MoveOnly> tgt(target, target+10);
auto end = std::uninitialized_move_n(src.begin(), 10, tgt.begin());
VERIFY( end.first == std::next(src.begin(), 10) );
@@ -165,26 +165,26 @@ void test09()
for (int i = 0; i < 10; ++i) VERIFY( target[i].val == i );
auto end2 = std::destroy_n(tgt.begin(), 10);
VERIFY( end2 == std::next(tgt.begin(), 10) );
- free(target);
+ std::free(target);
}
void test10()
{
- char* x = (char*)malloc(sizeof(char)*10);
+ char* x = (char*)std::malloc(sizeof(char)*10);
for (int i = 0; i < 10; ++i) new (x+i) char;
FwdIteratorRange<char> r(x, x+10);
std::destroy(r.begin(), r.end());
- free(x);
+ std::free(x);
}
void test11()
{
- char* x = (char*)malloc(sizeof(char)*10);
+ char* x = (char*)std::malloc(sizeof(char)*10);
for (int i = 0; i < 10; ++i) new (x+i) char;
FwdIteratorRange<char> r(x, x+10);
auto end = std::destroy_n(r.begin(), 10);
VERIFY( end == std::next(r.begin(), 10) );
- free(x);
+ std::free(x);
}
void test12()
@@ -193,12 +193,12 @@ void test12()
del_count = 0;
ctor_count = 0;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_default_construct(target, target+10);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
@@ -212,12 +212,12 @@ void test13()
del_count = 0;
ctor_count = 0;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_value_construct(target, target+10);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
@@ -231,12 +231,12 @@ void test14()
del_count = 0;
ctor_count = 0;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_default_construct_n(target, 10);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
@@ -250,12 +250,12 @@ void test15()
del_count = 0;
ctor_count = 0;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_value_construct_n(target, 10);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
@@ -271,12 +271,12 @@ void test16()
throw_after = 5;
throw_after = 5;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_move(source.begin(), source.end(), target);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
@@ -291,12 +291,12 @@ void test17()
ctor_count = 0;
throw_after = 5;
ThrowAfterN* target =
- (ThrowAfterN*)malloc(sizeof(ThrowAfterN)*10);
+ (ThrowAfterN*)std::malloc(sizeof(ThrowAfterN)*10);
try {
std::uninitialized_move_n(source.begin(), 10, target);
} catch (...) {
}
- free(target);
+ std::free(target);
VERIFY(ctor_count == 5);
VERIFY(del_count == 5);
throw_after = 0;
diff --git
a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
index d7395036036..765290cef26 100644
---
a/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
+++
b/libstdc++-v3/testsuite/21_strings/basic_string/operations/compare/char/1.cc
@@ -74,15 +74,15 @@ test01()
string str_2;
//sanity check
- test_value(strcmp("costa marbella", "costa rica"), lt);
- test_value(strcmp("costa rica", "costa rica"), z);
- test_value(strcmp(str_1.data(), str_0.data()), lt);
- test_value(strcmp(str_0.data(), str_1.data()), gt);
- test_value(strncmp(str_1.data(), str_0.data(), 6), z);
- test_value(strncmp(str_1.data(), str_0.data(), 10), lt);
- test_value(memcmp(str_1.data(), str_0.data(), 6), z);
- test_value(memcmp(str_1.data(), str_0.data(), 10), lt);
- test_value(memcmp("costa marbella", "costa rica", 10), lt);
+ test_value(std::strcmp("costa marbella", "costa rica"), lt);
+ test_value(std::strcmp("costa rica", "costa rica"), z);
+ test_value(std::strcmp(str_1.data(), str_0.data()), lt);
+ test_value(std::strcmp(str_0.data(), str_1.data()), gt);
+ test_value(std::strncmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::strncmp(str_1.data(), str_0.data(), 10), lt);
+ test_value(std::memcmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::memcmp(str_1.data(), str_0.data(), 10), lt);
+ test_value(std::memcmp("costa marbella", "costa rica", 10), lt);
// int compare(const basic_string& str) const;
test_value(str_0.compare(str_1), gt); //because r>m
diff --git
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
index ec2f226c5dd..3e574aa26e2 100644
---
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
+++
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/1.cc
@@ -73,15 +73,15 @@ test01()
string_view str_2;
//sanity check
- test_value(strcmp("costa marbella", "costa rica"), lt);
- test_value(strcmp("costa rica", "costa rica"), z);
- test_value(strcmp(str_1.data(), str_0.data()), lt);
- test_value(strcmp(str_0.data(), str_1.data()), gt);
- test_value(strncmp(str_1.data(), str_0.data(), 6), z);
- test_value(strncmp(str_1.data(), str_0.data(), 14), lt);
- test_value(memcmp(str_1.data(), str_0.data(), 6), z);
- test_value(memcmp(str_1.data(), str_0.data(), 10), lt);
- test_value(memcmp("costa marbella", "costa rica", 10), lt);
+ test_value(std::strcmp("costa marbella", "costa rica"), lt);
+ test_value(std::strcmp("costa rica", "costa rica"), z);
+ test_value(std::strcmp(str_1.data(), str_0.data()), lt);
+ test_value(std::strcmp(str_0.data(), str_1.data()), gt);
+ test_value(std::strncmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::strncmp(str_1.data(), str_0.data(), 14), lt);
+ test_value(std::memcmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::memcmp(str_1.data(), str_0.data(), 10), lt);
+ test_value(std::memcmp("costa marbella", "costa rica", 10), lt);
// int compare(const basic_string_view& str) const;
test_value(str_0.compare(str_1), gt); //because r>m
diff --git
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/70483.cc
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/70483.cc
index 69c77df56e7..fbc43b6548a 100644
---
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/70483.cc
+++
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/char/70483.cc
@@ -21,10 +21,10 @@
struct constexpr_char_traits : std::char_traits<char>
{
- static constexpr size_t
+ static constexpr std::size_t
length(const char* val)
{
- size_t res = 0;
+ std::size_t res = 0;
for (; val[res] != '\0'; ++res)
;
return res;
@@ -33,7 +33,7 @@ struct constexpr_char_traits : std::char_traits<char>
static constexpr int
compare(const char* lhs, const char* rhs, std::size_t count)
{
- for (size_t pos = 0; pos < count; ++pos)
+ for (std::size_t pos = 0; pos < count; ++pos)
{
if (lhs[pos] != rhs[pos])
return lhs[pos] - rhs[pos];
diff --git
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
index ea1f8fbe770..8623a456581 100644
---
a/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
+++
b/libstdc++-v3/testsuite/21_strings/basic_string_view/operations/compare/wchar_t/1.cc
@@ -74,15 +74,15 @@ test01()
wstring_view str_2;
//sanity check
- test_value(wcscmp(L"costa marbella", L"costa rica"), lt);
- test_value(wcscmp(L"costa rica", L"costa rica"), z);
- test_value(wcscmp(str_1.data(), str_0.data()), lt);
- test_value(wcscmp(str_0.data(), str_1.data()), gt);
- test_value(wcsncmp(str_1.data(), str_0.data(), 6), z);
- test_value(wcsncmp(str_1.data(), str_0.data(), 14), lt);
- test_value(wmemcmp(str_1.data(), str_0.data(), 6), z);
- test_value(wmemcmp(str_1.data(), str_0.data(), 14), lt);
- test_value(wmemcmp(L"costa marbella", L"costa rica", 14), lt);
+ test_value(std::wcscmp(L"costa marbella", L"costa rica"), lt);
+ test_value(std::wcscmp(L"costa rica", L"costa rica"), z);
+ test_value(std::wcscmp(str_1.data(), str_0.data()), lt);
+ test_value(std::wcscmp(str_0.data(), str_1.data()), gt);
+ test_value(std::wcsncmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::wcsncmp(str_1.data(), str_0.data(), 14), lt);
+ test_value(std::wmemcmp(str_1.data(), str_0.data(), 6), z);
+ test_value(std::wmemcmp(str_1.data(), str_0.data(), 14), lt);
+ test_value(std::wmemcmp(L"costa marbella", L"costa rica", 14), lt);
// int compare(const basic_string_view& str) const;
test_value(str_0.compare(str_1), gt); //because r>m
diff --git a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
index 5d15fc065b7..9ca304418f5 100644
--- a/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
+++ b/libstdc++-v3/testsuite/21_strings/c_strings/wchar_t/3_neg.cc
@@ -26,27 +26,27 @@ wchar_t *w1, *w2;
void
test01 ()
{
- w1 = wmemchr (w2, L'/', 3);
- w1 = wcschr (w2, L'/');
- w1 = wcspbrk (w2, L"abc");
- w1 = wcsrchr (w2, L'c');
- w1 = wcsstr (w2, L"abc");
+ w1 = std::wmemchr (w2, L'/', 3);
+ w1 = std::wcschr (w2, L'/');
+ w1 = std::wcspbrk (w2, L"abc");
+ w1 = std::wcsrchr (w2, L'c');
+ w1 = std::wcsstr (w2, L"abc");
- cw1 = wmemchr (w2, L'/', 3);
- cw1 = wcschr (w2, L'/');
- cw1 = wcspbrk (w2, L"abc");
- cw1 = wcsrchr (w2, L'c');
- cw1 = wcsstr (w2, L"abc");
+ cw1 = std::wmemchr (w2, L'/', 3);
+ cw1 = std::wcschr (w2, L'/');
+ cw1 = std::wcspbrk (w2, L"abc");
+ cw1 = std::wcsrchr (w2, L'c');
+ cw1 = std::wcsstr (w2, L"abc");
- w1 = wmemchr (cw2, L'/', 3); // { dg-error "invalid conversion" }
- w1 = wcschr (cw2, L'/'); // { dg-error "invalid conversion" }
- w1 = wcsrchr (cw2, L'c'); // { dg-error "invalid conversion" }
- w1 = wcspbrk (cw2, L"abc"); // { dg-error "invalid conversion" }
- w1 = wcsstr (cw2, L"abc"); // { dg-error "invalid conversion" }
+ w1 = std::wmemchr (cw2, L'/', 3); // { dg-error "invalid conversion" }
+ w1 = std::wcschr (cw2, L'/'); // { dg-error "invalid conversion" }
+ w1 = std::wcsrchr (cw2, L'c'); // { dg-error "invalid conversion" }
+ w1 = std::wcspbrk (cw2, L"abc"); // { dg-error "invalid conversion" }
+ w1 = std::wcsstr (cw2, L"abc"); // { dg-error "invalid conversion" }
- cw1 = wmemchr (cw2, L'/', 3);
- cw1 = wcschr (cw2, L'/');
- cw1 = wcspbrk (cw2, L"abc");
- cw1 = wcsrchr (cw2, L'c');
- cw1 = wcsstr (cw2, L"abc");
+ cw1 = std::wmemchr (cw2, L'/', 3);
+ cw1 = std::wcschr (cw2, L'/');
+ cw1 = std::wcspbrk (cw2, L"abc");
+ cw1 = std::wcsrchr (cw2, L'c');
+ cw1 = std::wcsstr (cw2, L"abc");
}
diff --git
a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/typedefs.cc
b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/typedefs.cc
index dced5ab9912..04a14adf4e7 100644
---
a/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/typedefs.cc
+++
b/libstdc++-v3/testsuite/21_strings/char_traits/requirements/wchar_t/typedefs.cc
@@ -35,7 +35,7 @@ int main()
// 21.1.3: char_traits<wchar_t>::int_type == wint_t
test_type::int_type* p = 0;
- wint_t* q __attribute__((unused)) = p;
+ std::wint_t* q __attribute__((unused)) = p;
return 0;
}
diff --git
a/libstdc++-v3/testsuite/22_locale/codecvt/requirements/base_classes.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/requirements/base_classes.cc
index 451ef0d6401..c31d3a94365 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/requirements/base_classes.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/requirements/base_classes.cc
@@ -25,7 +25,7 @@
void test01()
{
// Check for required base class.
- typedef std::codecvt<char, char, mbstate_t> test_type;
+ typedef std::codecvt<char, char, std::mbstate_t> test_type;
typedef std::locale::facet base_type;
const test_type& obj = std::use_facet<test_type>(std::locale());
const base_type* base __attribute__((unused)) = &obj;
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/requirements/typedefs.cc
b/libstdc++-v3/testsuite/22_locale/codecvt/requirements/typedefs.cc
index 5e4fd27ca74..f586b8c415f 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/requirements/typedefs.cc
@@ -25,7 +25,7 @@
void test01()
{
// Check for required typedefs
- typedef std::codecvt<char, char, mbstate_t> test_type;
+ typedef std::codecvt<char, char, std::mbstate_t> test_type;
typedef test_type::intern_type intern_type;
typedef test_type::extern_type extern_type;
typedef test_type::state_type state_type;
diff --git
a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/base_classes.cc
b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/base_classes.cc
index 326091ec987..c599c6ad8b9 100644
---
a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/base_classes.cc
+++
b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/base_classes.cc
@@ -25,8 +25,8 @@
void test01()
{
// Check for required base class.
- typedef std::codecvt_byname<char, char, mbstate_t> test_type;
- typedef std::codecvt<char, char, mbstate_t> base_type;
+ typedef std::codecvt_byname<char, char, std::mbstate_t> test_type;
+ typedef std::codecvt<char, char, std::mbstate_t> base_type;
const test_type& obj = std::use_facet<test_type>(std::locale::classic());
const base_type* base __attribute__((unused)) = &obj;
}
diff --git
a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/explicit_instantiation.cc
b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/explicit_instantiation.cc
index 96816a50498..7cc7eaaebc8 100644
---
a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/explicit_instantiation.cc
+++
b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/explicit_instantiation.cc
@@ -22,4 +22,4 @@
#include <locale>
-template class std::codecvt_byname<short, short, mbstate_t>;
+template class std::codecvt_byname<short, short, std::mbstate_t>;
diff --git
a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/typedefs.cc
b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/typedefs.cc
index b74474d6d79..fe2ef6d4fea 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_byname/requirements/typedefs.cc
@@ -25,7 +25,7 @@
void test01()
{
// Check for required typedefs
- typedef std::codecvt_byname<char, char, mbstate_t> test_type;
+ typedef std::codecvt_byname<char, char, std::mbstate_t> test_type;
typedef test_type::intern_type intern_type;
typedef test_type::extern_type extern_type;
typedef test_type::state_type state_type;
diff --git
a/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
b/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
index 42ee2869cc4..38aaf66676b 100644
---
a/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
+++
b/libstdc++-v3/testsuite/22_locale/conversions/buffer/requirements/typedefs.cc
@@ -25,7 +25,7 @@
void test01()
{
// Check for required typedefs
- struct cvt_type : std::codecvt<wchar_t, char, mbstate_t> { };
+ struct cvt_type : std::codecvt<wchar_t, char, std::mbstate_t> { };
typedef std::char_traits<wchar_t> traits_type;
typedef std::wbuffer_convert<cvt_type, wchar_t, traits_type> test_type; // {
dg-warning "deprecated" "" { target c++17 } }
typedef test_type::state_type state_type;
diff --git
a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc
b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc
index 6a86dae4e73..f4d6419ea11 100644
---
a/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc
+++
b/libstdc++-v3/testsuite/22_locale/conversions/string/requirements/typedefs.cc
@@ -24,7 +24,7 @@
void test01()
{
// Check for required typedefs
- typedef std::codecvt<wchar_t, char, mbstate_t> codecvt_type;
+ typedef std::codecvt<wchar_t, char, std::mbstate_t> codecvt_type;
typedef std::wstring_convert<codecvt_type> test_type;
// { dg-warning "deprecated" "" { target c++17 } 28 }
typedef test_type::byte_string byte_string;
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
b/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
index a4593616d6b..0994d57d75f 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
@@ -61,7 +61,7 @@ int main(int argc, char* argv[])
int iters = 30000;
if (argc > 1)
- iters = atoi(argv[1]);
+ iters = std::atoi(argv[1]);
if (iters < 1)
iters = 1;
test01(iters);
diff --git a/libstdc++-v3/testsuite/23_containers/list/pthread1.cc
b/libstdc++-v3/testsuite/23_containers/list/pthread1.cc
index be3f0f4a9f7..5231e64f4d7 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pthread1.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pthread1.cc
@@ -89,7 +89,7 @@ consume(void* t)
while (tq.foo.size () == 0)
pthread_cond_wait (&tq.fooCond2, &tq.fooLock);
if (tq.foo.front () != num++)
- abort ();
+ std::abort ();
tq.foo.pop_front ();
pthread_cond_signal (&tq.fooCond1);
pthread_mutex_unlock (&tq.fooLock);
diff --git a/libstdc++-v3/testsuite/23_containers/list/pthread5.cc
b/libstdc++-v3/testsuite/23_containers/list/pthread5.cc
index f8935d1cebf..42e669cfcb7 100644
--- a/libstdc++-v3/testsuite/23_containers/list/pthread5.cc
+++ b/libstdc++-v3/testsuite/23_containers/list/pthread5.cc
@@ -74,7 +74,7 @@ thread_function (void* arg)
for (aIt = mylist.begin (); aIt != mylist.end (); ++aIt)
{
if ((*aIt) == &(string_array[k]))
- abort ();
+ std::abort ();
}
}
mylist.push_back (&(string_array[k]));
@@ -108,16 +108,16 @@ main ()
ids[worker] = worker;
if (pthread_create(&threads[worker], &tattr,
thread_function, &ids[worker]))
- abort ();
+ std::abort ();
}
for (worker = 0; worker < NTHREADS; worker++)
{
if (pthread_join(threads[worker], static_cast<void **>(&status)))
- abort ();
+ std::abort ();
if (*((int *)status) != worker)
- abort ();
+ std::abort ();
}
return (0);
diff --git a/libstdc++-v3/testsuite/23_containers/span/deduction.cc
b/libstdc++-v3/testsuite/23_containers/span/deduction.cc
index 55a586254e8..e0bf36ed038 100644
--- a/libstdc++-v3/testsuite/23_containers/span/deduction.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/deduction.cc
@@ -81,7 +81,7 @@ test01()
std::span s12(const_cast<const std::span<int>&>(s5));
static_assert( is_dynamic_span<int>(s12) );
- std::span s13(a.data(), std::integral_constant<size_t, 3>{});
+ std::span s13(a.data(), std::integral_constant<std::size_t, 3>{});
static_assert( is_static_span<long, 3>(s13) );
std::span s14(a.data(), true);
diff --git a/libstdc++-v3/testsuite/23_containers/span/everything.cc
b/libstdc++-v3/testsuite/23_containers/span/everything.cc
index c7981ea6439..cf8362fc679 100644
--- a/libstdc++-v3/testsuite/23_containers/span/everything.cc
+++ b/libstdc++-v3/testsuite/23_containers/span/everything.cc
@@ -167,7 +167,7 @@ main()
VERIFY(really_empty);
std::vector<std::int_least32_t> value{ 0 };
- std::span<int32_t> muh_span(value);
+ std::span<std::int32_t> muh_span(value);
VERIFY(muh_span.size() == 1);
std::byte* original_bytes =
reinterpret_cast<std::byte*>(value.data());
original_bytes[0] = static_cast<std::byte>(1);
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_copy.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_copy.cc
index b0f6aa176c4..65c97160798 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_copy.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_copy.cc
@@ -25,12 +25,12 @@
void
test01()
{
- typedef std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>
+ typedef std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>
base_engine;
base_engine b;
- std::independent_bits_engine<base_engine, 48, uint_fast64_t> e(b);
+ std::independent_bits_engine<base_engine, 48, std::uint_fast64_t> e(b);
}
int main()
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_move.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_move.cc
index ec80011f91f..94a32d5fff2 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_move.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/base_move.cc
@@ -25,10 +25,10 @@
void
test01()
{
- typedef std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>
+ typedef std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>
base_engine;
- std::independent_bits_engine<base_engine, 48, uint_fast64_t>
+ std::independent_bits_engine<base_engine, 48, std::uint_fast64_t>
e(std::move(base_engine()));
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/copy.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/copy.cc
index b8a593a4ee8..2ddb475ecba 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/copy.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/copy.cc
@@ -27,9 +27,9 @@ test01()
{
std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
> e(1);
const auto f(e);
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/default.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/default.cc
index 7acfabf167f..252321c8cee 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/default.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/default.cc
@@ -27,9 +27,9 @@ test01()
{
std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
> e;
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed1.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed1.cc
index fc406eb3647..90c528640da 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed1.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed1.cc
@@ -29,9 +29,9 @@ test01()
std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
> e(seed);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed2.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed2.cc
index 3a0f1a00588..abe5482d741 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed2.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed2.cc
@@ -29,9 +29,9 @@ test01()
std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
> e(seed);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq.cc
index f145baf0a4b..bd4f1a321a6 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq.cc
@@ -29,9 +29,9 @@ test01()
std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
> e(seq);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq2.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq2.cc
index 051e955f455..9ca8d3b9478 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq2.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/cons/seed_seq2.cc
@@ -57,9 +57,9 @@ struct seed_seq
using engine_type
= std::independent_bits_engine
<
- std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
+ std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
48,
- uint_fast64_t
+ std::uint_fast64_t
>;
void
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/equal.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/equal.cc
index b70a1b2e109..34dc7050d17 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/equal.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/equal.cc
@@ -30,8 +30,8 @@ void
test01()
{
std::independent_bits_engine
- <std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
- 48, uint_fast64_t> u, v;
+ <std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
+ 48, std::uint_fast64_t> u, v;
VERIFY( u == v );
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/inequal.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/inequal.cc
index ce9965c3afa..c39c12bae85 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/inequal.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/inequal.cc
@@ -29,8 +29,8 @@ void
test01()
{
std::independent_bits_engine
- <std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
- 48, uint_fast64_t> u, v;
+ <std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
+ 48, std::uint_fast64_t> u, v;
VERIFY( !(u != v) );
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/serialize.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/serialize.cc
index f3e40d75cc2..ee876b34fd1 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/serialize.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/operators/serialize.cc
@@ -32,8 +32,8 @@ test01()
{
std::stringstream str;
std::independent_bits_engine
- <std::subtract_with_carry_engine<uint_fast64_t, 48, 5, 12>,
- 48, uint_fast64_t> u, v;
+ <std::subtract_with_carry_engine<std::uint_fast64_t, 48, 5, 12>,
+ 48, std::uint_fast64_t> u, v;
u(); // advance
str << u;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/requirements/typedefs.cc
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/requirements/typedefs.cc
index 8a4f1e6cc32..4b4a011636d 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/requirements/typedefs.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/independent_bits_engine/requirements/typedefs.cc
@@ -32,9 +32,9 @@ test01()
<
std::subtract_with_carry_engine
<
- uint_fast64_t, 48, 5, 12
+ std::uint_fast64_t, 48, 5, 12
>,
- 48, uint_fast64_t
+ 48, std::uint_fast64_t
> test_type;
typedef test_type::result_type result_type;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_copy.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_copy.cc
index 712245dc335..eea9c891c57 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_copy.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_copy.cc
@@ -26,7 +26,7 @@ void
test01()
{
typedef std::linear_congruential_engine
- <uint_fast32_t, 16807UL, 0UL, 2147483647UL> base_engine;
+ <std::uint_fast32_t, 16807UL, 0UL, 2147483647UL> base_engine;
base_engine b;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_move.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_move.cc
index 91902e9172e..615f5eb0633 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_move.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/base_move.cc
@@ -26,7 +26,7 @@ void
test01()
{
typedef std::linear_congruential_engine
- <uint_fast32_t, 16807UL, 0UL, 2147483647UL> base_engine;
+ <std::uint_fast32_t, 16807UL, 0UL, 2147483647UL> base_engine;
std::shuffle_order_engine<base_engine, 256>
e(std::move(base_engine()));
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/copy.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/copy.cc
index cabc0881f26..15773e89e47 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/copy.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/copy.cc
@@ -27,7 +27,7 @@ test01()
{
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> e(1);
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/default.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/default.cc
index ff2f913596c..4a60790627c 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/default.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/default.cc
@@ -27,7 +27,7 @@ test01()
{
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> e;
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed1.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed1.cc
index c11876f6e68..9e6bc1a9bc9 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed1.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed1.cc
@@ -29,7 +29,7 @@ test01()
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> e(seed);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed2.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed2.cc
index 8a16efa2839..79dddbe0d62 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed2.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed2.cc
@@ -29,7 +29,7 @@ test01()
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> e(seed);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq.cc
index 21143cd8f73..0ece0729005 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq.cc
@@ -29,7 +29,7 @@ test01()
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> e(seq);
}
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq2.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq2.cc
index 8826dce1077..b1cadd415fd 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq2.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/cons/seed_seq2.cc
@@ -57,7 +57,7 @@ struct seed_seq
using engine_type
= std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
>;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/equal.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/equal.cc
index 1ad3832ede4..02ed4c46bba 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/equal.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/equal.cc
@@ -31,7 +31,7 @@ test01()
{
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> u, v;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/inequal.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/inequal.cc
index ea4d4f8c791..70d8e6f07aa 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/inequal.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/inequal.cc
@@ -30,7 +30,7 @@ test01()
{
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> u, v;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/serialize.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/serialize.cc
index 712d3e00257..06161d14343 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/serialize.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/operators/serialize.cc
@@ -33,7 +33,7 @@ test01()
std::stringstream str;
std::shuffle_order_engine
<
- std::linear_congruential_engine<uint_fast32_t,16807UL, 0UL,
2147483647UL>,
+ std::linear_congruential_engine<std::uint_fast32_t,16807UL, 0UL,
2147483647UL>,
256
> u, v;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/requirements/typedefs.cc
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/requirements/typedefs.cc
index 60744c28e36..f6385bbdf79 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/requirements/typedefs.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/shuffle_order_engine/requirements/typedefs.cc
@@ -32,7 +32,7 @@ test01()
<
std::linear_congruential_engine
<
- uint_fast32_t,16807UL, 0UL, 2147483647UL
+ std::uint_fast32_t,16807UL, 0UL, 2147483647UL
>,
256
> test_type;
diff --git
a/libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/lwg3809.cc
b/libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/lwg3809.cc
index b6fb57f8eeb..7221fbb4dfe 100644
---
a/libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/lwg3809.cc
+++
b/libstdc++-v3/testsuite/26_numerics/random/subtract_with_carry_engine/cons/lwg3809.cc
@@ -4,13 +4,13 @@
// PR 107466 - invalid -Wnarrowing error with std::subtract_with_carry_engine
-// LWG 3809. Is std::subtract_with_carry_engine<uint16_t> supposed to work?
+// LWG 3809. Is std::subtract_with_carry_engine<std::uint16_t> supposed to
work?
void
test_lwg3809()
{
// It should be possible to construct this engine with a 16-bit result_type:
- std::subtract_with_carry_engine<uint16_t, 12, 5, 12> s16;
- std::subtract_with_carry_engine<uint32_t, 12, 5, 12> s32;
+ std::subtract_with_carry_engine<std::uint16_t, 12, 5, 12> s16;
+ std::subtract_with_carry_engine<std::uint32_t, 12, 5, 12> s32;
// It should have been seeded with the same sequence as the 32-bit version
// and produce random numbers in the same range, [0, 1<<12).
for (int i = 0; i < 10; ++i)
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
index e14d2878147..ff20f0aa558 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9169.cc
@@ -27,7 +27,7 @@
const char name_04[] = "filebuf_virtuals-4.txt"; // empty file, need to create
-class Cvt_to_upper : public std::codecvt<char, char, mbstate_t>
+class Cvt_to_upper : public std::codecvt<char, char, std::mbstate_t>
{
bool do_always_noconv() const throw()
{
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
index d76ebf31ebc..48363173884 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/char/9182-2.cc
@@ -27,17 +27,17 @@
const char name_07[] = "filebuf_virtuals-7.txt"; // empty file, need to create
-class errorcvt : public std::codecvt<char, char, mbstate_t>
+class errorcvt : public std::codecvt<char, char, std::mbstate_t>
{
protected:
std::codecvt_base::result
- do_out(mbstate_t&, const char* from, const char*,
+ do_out(std::mbstate_t&, const char* from, const char*,
const char*& from_next, char* to, char*,
char*& to_next) const
{
from_next = from;
to_next = to;
- return std::codecvt<char, char, mbstate_t>::error;
+ return std::codecvt<char, char, std::mbstate_t>::error;
}
virtual bool do_always_noconv() const throw()
diff --git
a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
index 474a49f83dc..aa95e3597c1 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/9875_seekoff.cc
@@ -23,7 +23,7 @@
#include <cstring>
#include <testsuite_hooks.h>
-class Cvt : public std::codecvt<wchar_t, char, mbstate_t>
+class Cvt : public std::codecvt<wchar_t, char, std::mbstate_t>
{
protected:
virtual std::codecvt_base::result
diff --git
a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
index f0d3b59f7b2..3a0a5312374 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9875_seekpos.cc
@@ -23,7 +23,7 @@
#include <cstring>
#include <testsuite_hooks.h>
-class Cvt : public std::codecvt<wchar_t, char, mbstate_t>
+class Cvt : public std::codecvt<wchar_t, char, std::mbstate_t>
{
protected:
virtual std::codecvt_base::result
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
index ca110eccda5..dd32e82c1d7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sync/char/9182-1.cc
@@ -27,17 +27,17 @@
const char name_07[] = "filebuf_virtuals-7.txt"; // empty file, need to create
-class errorcvt : public std::codecvt<char, char, mbstate_t>
+class errorcvt : public std::codecvt<char, char, std::mbstate_t>
{
protected:
std::codecvt_base::result
- do_out(mbstate_t&, const char* from, const char*,
+ do_out(std::mbstate_t&, const char* from, const char*,
const char*& from_next, char* to, char*,
char*& to_next) const
{
from_next = from;
to_next = to;
- return std::codecvt<char, char, mbstate_t>::error;
+ return std::codecvt<char, char, std::mbstate_t>::error;
}
virtual bool do_always_noconv() const throw()
diff --git
a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
index 7f98913fe77..7c27e9df441 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc
@@ -22,7 +22,7 @@
#include <cstdio>
#include <testsuite_hooks.h>
-template <typename InternT, typename StateT = mbstate_t>
+template <typename InternT, typename StateT = std::mbstate_t>
class checksumcvt : public std::codecvt<InternT, char, StateT>
{
typedef std::codecvt<InternT, char, StateT> Base;
diff --git
a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
index 397f4117930..f4eb85aade7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc
@@ -22,7 +22,7 @@
#include <cstdio>
#include <testsuite_hooks.h>
-template <typename InternT, typename StateT = mbstate_t>
+template <typename InternT, typename StateT = std::mbstate_t>
class checksumcvt : public std::codecvt<InternT, char, StateT>
{
typedef std::codecvt<InternT, char, StateT> Base;
diff --git
a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
index f0015800a4d..37191970da7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9178.cc
@@ -24,7 +24,7 @@
#include <locale>
#include <testsuite_hooks.h>
-template <typename InternT, typename StateT = mbstate_t>
+template <typename InternT, typename StateT = std::mbstate_t>
class checksumcvt : public std::codecvt<InternT, char, StateT>
{
typedef std::codecvt<InternT, char, StateT> Base;
diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/construct/format.cc
b/libstdc++-v3/testsuite/27_io/filesystem/path/construct/format.cc
index d14127b5ce4..80e9776bb1a 100644
--- a/libstdc++-v3/testsuite/27_io/filesystem/path/construct/format.cc
+++ b/libstdc++-v3/testsuite/27_io/filesystem/path/construct/format.cc
@@ -102,7 +102,7 @@ test06()
// path(InputIterator, InputIterator, format)
const char s[] = "foo/bar";
using namespace __gnu_test;
- const test_container<const char, input_iterator_wrapper> c(s, s + strlen(s));
+ const test_container<const char, input_iterator_wrapper> c(s, s +
std::strlen(s));
auto c0 = c;
path p0(std::begin(c0), std::end(c0));
auto c1 = c;
@@ -137,7 +137,7 @@ test08()
// path(InputIterator, InputIterator, const locale&, format)
const char s[] = "foo/bar";
using namespace __gnu_test;
- const test_container<const char, input_iterator_wrapper> c(s, s + strlen(s));
+ const test_container<const char, input_iterator_wrapper> c(s, s +
std::strlen(s));
std::locale loc;
auto c0 = c;
path p0(std::begin(c0), std::end(c0), loc);
diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
b/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
index c7a7fc82839..064d7098aac 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/11584.cc
@@ -32,12 +32,12 @@ void* operator new(std::size_t n, const std::nothrow_t&)
throw()
{
if (new_fails)
return 0;
- return malloc(n);
+ return std::malloc(n);
}
void* operator new[] (std::size_t n, const std::nothrow_t& ntt) throw()
{ return operator new(n, ntt); }
-void operator delete (void *p) throw() { free(p); }
+void operator delete (void *p) throw() { std::free(p); }
void operator delete[] (void *p) throw() { operator delete(p); }
int main ()
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
index 696c452697d..9c9497bd674 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
@@ -30,8 +30,8 @@ test01()
wchar_t buf[2];
VERIFY( std::wcin.rdbuf()->sgetn(buf, 2) == 2 );
- wint_t c1 = std::wcin.rdbuf()->sungetc();
- wint_t c2 = std::fgetwc(stdin);
+ std::wint_t c1 = std::wcin.rdbuf()->sungetc();
+ std::wint_t c2 = std::fgetwc(stdin);
VERIFY( c1 == std::char_traits<wchar_t>::to_int_type(buf[1]) );
VERIFY( c2 == c1 );
}
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
index 21ff570ce20..3f0e5152e54 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/100334.cc
@@ -39,8 +39,8 @@ struct atomics_sharing_same_waiter
constexpr unsigned key(void * a)
{
- constexpr uintptr_t ct = 16;
- return (uintptr_t(a) >> 2) % ct;
+ constexpr std::uintptr_t ct = 16;
+ return (std::uintptr_t(a) >> 2) % ct;
}
int
diff --git a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc
b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc
index c69a7a647ca..9aa7391478f 100644
--- a/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc
+++ b/libstdc++-v3/testsuite/30_threads/condition_variable_any/cond.cc
@@ -25,9 +25,9 @@
int main()
{
- const size_t sz = sizeof(std::condition_variable_any);
+ const std::size_t sz = sizeof(std::condition_variable_any);
char garbage[sz];
- memset(garbage, 0xff, sz);
+ std::memset(garbage, 0xff, sz);
auto cond = new ((void*)garbage) std::condition_variable_any();
cond->notify_all();
cond->~condition_variable_any();
diff --git
a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
index d680c797b08..8f3b9fc0045 100644
--- a/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc
@@ -29,7 +29,7 @@
int main()
{
typedef std::recursive_timed_mutex mutex_type;
- typedef std::chrono::duration<int64_t, std::pico> picoseconds;
+ typedef std::chrono::duration<std::int64_t, std::pico> picoseconds;
try
{
diff --git a/libstdc++-v3/testsuite/30_threads/semaphore/100806.cc
b/libstdc++-v3/testsuite/30_threads/semaphore/100806.cc
index 4b761cef202..53dc04646be 100644
--- a/libstdc++-v3/testsuite/30_threads/semaphore/100806.cc
+++ b/libstdc++-v3/testsuite/30_threads/semaphore/100806.cc
@@ -17,7 +17,7 @@ std::counting_semaphore<6> semaphore{6};
std::mutex mtx;
std::vector<std::string> results;
-void thread_main(size_t x)
+void thread_main(std::size_t x)
{
semaphore.acquire();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
@@ -36,7 +36,7 @@ int main()
std::vector<std::thread> threads(nthreads);
- size_t counter{0};
+ std::size_t counter{0};
for(auto& t : threads)
{
t = std::thread(thread_main, counter++);
diff --git a/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
b/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
index 8c403c1c3b6..b4019dd48ba 100644
--- a/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
+++ b/libstdc++-v3/testsuite/std/ranges/access/p2602.cc
@@ -20,11 +20,11 @@ static_assert( std::ranges::range<B> );
static_assert( ! std::ranges::range<const B> );
class Test {
- friend size_t size(const Test&) {
+ friend std::size_t size(const Test&) {
return 0;
}
};
-size_t f(Test t) {
+std::size_t f(Test t) {
return std::ranges::size(t);
}
base-commit: a06228ca4dddac44bba28c8e9ebd2f7000167c2e
--
2.51.0
