Skip to content

Commit

Permalink
[libc++][test] Uses qualified std::uint32_t.
Browse files Browse the repository at this point in the history
The module std does not provide c-types in the global namespace. This
means all these types need to be fully qualified. This is a first step
to convert them by using sed.

Since this is an automated conversion other types like uint64_t are kept
as is.

Note that tests in the directory libcxx/test/std/depr/depr.c.headers
should not be converted automatically. This requires manual attention,
there some test require testing uint32_t in the global namespace. These
test should fail when using the std module, and pass when using the
std.compat module.

A similar issue occurs with atomic, atomic_uint32_t is specified as
  using atomic_uint32_t = atomic<uint32_t>; // freestanding
So here too we need to keep the name in the global namespace in the
tests.

Reviewed By: ldionne, #libc

Differential Revision: https://reviews.llvm.org/D145520
  • Loading branch information
mordante committed Mar 8, 2023
1 parent adbdf27 commit da79d6e
Show file tree
Hide file tree
Showing 35 changed files with 93 additions and 92 deletions.
Expand Up @@ -53,7 +53,7 @@ int main(int, char**)

test<uint8_t>();
test<uint16_t>();
test<uint32_t>();
test<std::uint32_t>();
test<uint64_t>();

#ifndef TEST_HAS_NO_INT128
Expand Down
8 changes: 4 additions & 4 deletions libcxx/test/libcxx/type_traits/convert_to_integral.pass.cpp
Expand Up @@ -94,12 +94,12 @@ int main(int, char**)
#endif
check_integral_types<char16_t, int>();
// On some platforms, unsigned int and long are the same size. These
// platforms have a choice of making uint32_t an int or a long. However
// platforms have a choice of making std::uint32_t an int or a long. However
// char32_t must promote to an unsigned int on these platforms [conv.prom].
// Use the following logic to make the test work on such platforms.
// (sizeof(uint32_t) == sizeof(unsigned int)) ? unsigned int : uint32_t;
typedef std::conditional<sizeof(uint32_t) == sizeof(unsigned int),
unsigned int, uint32_t>::type char_integral;
// (sizeof(std::uint32_t) == sizeof(unsigned int)) ? unsigned int : std::uint32_t;
typedef std::conditional<sizeof(std::uint32_t) == sizeof(unsigned int),
unsigned int, std::uint32_t>::type char_integral;
check_integral_types<char32_t, char_integral>();
check_integral_types<short, int>();
check_integral_types<unsigned short, int>();
Expand Down
Expand Up @@ -89,7 +89,7 @@ constexpr void test() {
#endif

// 32-bit types.
using integral_32 = types::type_list<char32_t, int32_t, uint32_t>;
using integral_32 = types::type_list<char32_t, int32_t, std::uint32_t>;
#if !defined(TEST_HAS_NO_WIDE_CHARACTERS) && __WCHAR_WIDTH__ == 32
check<true, types::concatenate_t<integral_32, types::type_list<wchar_t>>>();
#else
Expand Down
Expand Up @@ -17,7 +17,7 @@

#include "test_macros.h"

typedef std::__murmur2_or_cityhash<uint32_t> Hash32;
typedef std::__murmur2_or_cityhash<std::uint32_t> Hash32;
typedef std::__murmur2_or_cityhash<uint64_t> Hash64;

void test(const void* key, int len) {
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/std/atomics/types.pass.cpp
Expand Up @@ -142,7 +142,7 @@ int main(int, char**)
test< int16_t> ();
test<uint16_t> ();
test< int32_t> ();
test<uint32_t> ();
test<std::uint32_t> ();
test< int64_t> ();
test<uint64_t> ();

Expand Down
Expand Up @@ -184,7 +184,7 @@ TEST_CONSTEXPR_CXX20 void test_ctor_with_different_value_type() {
{
// Though the types are different, initialization can be done with `memcpy`.
int32_t array[1] = { -1 };
std::vector<uint32_t> v(array, array + 1);
std::vector<std::uint32_t> v(array, array + 1);
assert(v[0] == 4294967295U);
}
}
Expand Down
Expand Up @@ -43,7 +43,7 @@ void compile_narrowing_conversion() {
supported_native_simd_ctor<int64_t>(3);
supported_native_simd_ctor<uint8_t>(3);
supported_native_simd_ctor<uint16_t>(3);
supported_native_simd_ctor<uint32_t>(3);
supported_native_simd_ctor<std::uint32_t>(3);
supported_native_simd_ctor<uint64_t>(3);
supported_native_simd_ctor<float>(3.f);
supported_native_simd_ctor<double>(3.);
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/experimental/simd/simd.cons/load.pass.cpp
Expand Up @@ -38,13 +38,13 @@ void supported_native_simd_ctor(...) = delete;

void compile_load_ctor() {
supported_native_simd_ctor<int>((int*)nullptr, ex::element_aligned_tag());
supported_native_simd_ctor<uint32_t>((int*)nullptr,
supported_native_simd_ctor<std::uint32_t>((int*)nullptr,
ex::element_aligned_tag());
supported_native_simd_ctor<double>((float*)nullptr,
ex::element_aligned_tag());
supported_native_simd_ctor<uint16_t>((unsigned int*)nullptr,
ex::element_aligned_tag());
supported_native_simd_ctor<uint32_t>((float*)nullptr,
supported_native_simd_ctor<std::uint32_t>((float*)nullptr,
ex::element_aligned_tag());

not_supported_native_simd_ctor<int>((int*)nullptr, int());
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/experimental/simd/simd.mem/load.pass.cpp
Expand Up @@ -39,10 +39,10 @@ void supported_load(...) = delete;

void compile_load() {
supported_load<int>((int*)nullptr, ex::element_aligned_tag());
supported_load<uint32_t>((int*)nullptr, ex::element_aligned_tag());
supported_load<std::uint32_t>((int*)nullptr, ex::element_aligned_tag());
supported_load<double>((float*)nullptr, ex::element_aligned_tag());
supported_load<uint16_t>((unsigned int*)nullptr, ex::element_aligned_tag());
supported_load<uint32_t>((float*)nullptr, ex::element_aligned_tag());
supported_load<std::uint32_t>((float*)nullptr, ex::element_aligned_tag());

not_supported_load<int>((int*)nullptr, int());
}
Expand Down
Expand Up @@ -29,7 +29,7 @@ static_assert(ex::is_abi_tag<ex::simd_abi::native<int32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<int64_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<uint8_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<uint16_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<uint32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<std::uint32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<uint64_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<float>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::native<double>>::value, "");
Expand All @@ -40,7 +40,7 @@ static_assert(ex::is_abi_tag<ex::simd_abi::compatible<int32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<int64_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<uint8_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<uint16_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<uint32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<std::uint32_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<uint64_t>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<float>>::value, "");
static_assert(ex::is_abi_tag<ex::simd_abi::compatible<double>>::value, "");
Expand Down Expand Up @@ -72,7 +72,7 @@ static_assert(ex::is_abi_tag_v<ex::simd_abi::native<int32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<int64_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<uint8_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<uint16_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<uint32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<std::uint32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<uint64_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<float>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::native<double>>, "");
Expand All @@ -83,7 +83,7 @@ static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<int32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<int64_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<uint8_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<uint16_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<uint32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<std::uint32_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<uint64_t>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<float>>, "");
static_assert(ex::is_abi_tag_v<ex::simd_abi::compatible<double>>, "");
Expand Down
16 changes: 8 additions & 8 deletions libcxx/test/std/experimental/simd/simd.traits/is_simd.pass.cpp
Expand Up @@ -29,7 +29,7 @@ static_assert(ex::is_simd<ex::native_simd<int32_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<int64_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<uint8_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<uint16_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<uint32_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<std::uint32_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<uint64_t>>::value, "");
static_assert(ex::is_simd<ex::native_simd<float>>::value, "");
static_assert(ex::is_simd<ex::native_simd<double>>::value, "");
Expand All @@ -40,7 +40,7 @@ static_assert(ex::is_simd<ex::fixed_size_simd<int32_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<int64_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint8_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint16_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint32_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<std::uint32_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint64_t, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<float, 1>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<double, 1>>::value, "");
Expand All @@ -51,7 +51,7 @@ static_assert(ex::is_simd<ex::fixed_size_simd<int32_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<int64_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint8_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint16_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint32_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<std::uint32_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint64_t, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<float, 3>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<double, 3>>::value, "");
Expand All @@ -62,7 +62,7 @@ static_assert(ex::is_simd<ex::fixed_size_simd<int32_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<int64_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint8_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint16_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint32_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<std::uint32_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<uint64_t, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<float, 32>>::value, "");
static_assert(ex::is_simd<ex::fixed_size_simd<double, 32>>::value, "");
Expand All @@ -80,7 +80,7 @@ static_assert(ex::is_simd_v<ex::native_simd<int32_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<int64_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<uint8_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<uint16_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<uint32_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<std::uint32_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<uint64_t>>, "");
static_assert(ex::is_simd_v<ex::native_simd<float>>, "");
static_assert(ex::is_simd_v<ex::native_simd<double>>, "");
Expand All @@ -91,7 +91,7 @@ static_assert(ex::is_simd_v<ex::fixed_size_simd<int32_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<int64_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint8_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint16_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint32_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<std::uint32_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint64_t, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<float, 1>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<double, 1>>, "");
Expand All @@ -102,7 +102,7 @@ static_assert(ex::is_simd_v<ex::fixed_size_simd<int32_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<int64_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint8_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint16_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint32_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<std::uint32_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint64_t, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<float, 3>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<double, 3>>, "");
Expand All @@ -113,7 +113,7 @@ static_assert(ex::is_simd_v<ex::fixed_size_simd<int32_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<int64_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint8_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint16_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint32_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<std::uint32_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<uint64_t, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<float, 32>>, "");
static_assert(ex::is_simd_v<ex::fixed_size_simd<double, 32>>, "");
Expand Down
Expand Up @@ -29,7 +29,7 @@ static_assert(ex::is_simd_mask<ex::native_simd_mask<int32_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<int64_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<uint8_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<uint16_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<uint32_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<std::uint32_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<uint64_t>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<float>>::value, "");
static_assert(ex::is_simd_mask<ex::native_simd_mask<double>>::value, "");
Expand All @@ -45,7 +45,7 @@ static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint8_t, 1>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint16_t, 1>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint32_t, 1>>::value,
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<std::uint32_t, 1>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint64_t, 1>>::value,
"");
Expand All @@ -63,7 +63,7 @@ static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint8_t, 3>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint16_t, 3>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint32_t, 3>>::value,
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<std::uint32_t, 3>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint64_t, 3>>::value,
"");
Expand All @@ -82,7 +82,7 @@ static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint8_t, 32>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint16_t, 32>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint32_t, 32>>::value,
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<std::uint32_t, 32>>::value,
"");
static_assert(ex::is_simd_mask<ex::fixed_size_simd_mask<uint64_t, 32>>::value,
"");
Expand All @@ -103,7 +103,7 @@ static_assert(ex::is_simd_mask_v<ex::native_simd_mask<int32_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<int64_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<uint8_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<uint16_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<uint32_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<std::uint32_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<uint64_t>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<float>>, "");
static_assert(ex::is_simd_mask_v<ex::native_simd_mask<double>>, "");
Expand All @@ -114,7 +114,7 @@ static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int32_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int64_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint8_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint16_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint32_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<std::uint32_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint64_t, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<float, 1>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<double, 1>>, "");
Expand All @@ -125,7 +125,7 @@ static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int32_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int64_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint8_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint16_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint32_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<std::uint32_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint64_t, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<float, 3>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<double, 3>>, "");
Expand All @@ -136,7 +136,7 @@ static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int32_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<int64_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint8_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint16_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint32_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<std::uint32_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<uint64_t, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<float, 32>>, "");
static_assert(ex::is_simd_mask_v<ex::fixed_size_simd_mask<double, 32>>, "");
Expand Down
Expand Up @@ -65,7 +65,7 @@ int main(int, char**)

test_octal<uint16_t>( "177777");
test_octal< int16_t>( "177777");
test_octal<uint32_t>( "37777777777");
test_octal<std::uint32_t>( "37777777777");
test_octal< int32_t>( "37777777777");
test_octal<uint64_t>("1777777777777777777777");
test_octal< int64_t>("1777777777777777777777");
Expand All @@ -85,7 +85,7 @@ int main(int, char**)

test_dec<uint16_t>( "65535");
test_dec< int16_t>( "-1");
test_dec<uint32_t>( "4294967295");
test_dec<std::uint32_t>( "4294967295");
test_dec< int32_t>( "-1");
test_dec<uint64_t>("18446744073709551615");
test_dec< int64_t>( "-1");
Expand All @@ -100,7 +100,7 @@ int main(int, char**)

test_hex<uint16_t>( "FFFF");
test_hex< int16_t>( "FFFF");
test_hex<uint32_t>( "FFFFFFFF");
test_hex<std::uint32_t>( "FFFFFFFF");
test_hex< int32_t>( "FFFFFFFF");
test_hex<uint64_t>("FFFFFFFFFFFFFFFF");
test_hex< int64_t>("FFFFFFFFFFFFFFFF");
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/std/numerics/bit/bit.endian/endian.pass.cpp
Expand Up @@ -38,7 +38,7 @@ int main(int, char**) {

// Try to check at runtime
{
uint32_t i = 0x01020304;
std::uint32_t i = 0x01020304;
char c[4];
static_assert(sizeof(i) == sizeof(c));
std::memcpy(c, &i, sizeof(c));
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp
Expand Up @@ -41,7 +41,7 @@ int main(int, char**)

static_assert(toobig<uint8_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<uint16_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<uint32_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<std::uint32_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<uint64_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<size_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
static_assert(toobig<uintmax_t>(), ""); // expected-error-re {{{{(static_assert|static assertion)}} expression is not an integral constant expression}}
Expand Down
4 changes: 2 additions & 2 deletions libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.pass.cpp
Expand Up @@ -117,7 +117,7 @@ int main(int, char**)
#endif
static_assert(test<uint8_t>());
static_assert(test<uint16_t>());
static_assert(test<uint32_t>());
static_assert(test<std::uint32_t>());
static_assert(test<uint64_t>());
static_assert(test<uintmax_t>());
static_assert(test<uintptr_t>());
Expand All @@ -133,7 +133,7 @@ int main(int, char**)
#endif
test<uint8_t>();
test<uint16_t>();
test<uint32_t>();
test<std::uint32_t>();
test<uint64_t>();
test<uintmax_t>();
test<uintptr_t>();
Expand Down

0 comments on commit da79d6e

Please sign in to comment.