diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-05-12 14:25:50 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-05-12 17:47:09 +0100 |
| commit | 1f973c295b699011acd7d5fcb04bd2bf887da16d (patch) | |
| tree | e92ffdb0a80c78872c5fe0d8e9afd719762d7c97 | |
| parent | 0b6aebf7bbe1256d8d9ace7e4e44c7b032e8592b (diff) | |
| download | gcc-1f973c295b699011acd7d5fcb04bd2bf887da16d.zip gcc-1f973c295b699011acd7d5fcb04bd2bf887da16d.tar.gz gcc-1f973c295b699011acd7d5fcb04bd2bf887da16d.tar.bz2 | |
libstdc++: Remove redundant dependencies on _GLIBCXX_USE_C99_STDINT_TR1
We never need to use std::make_unsigned in std::char_traits<char16_t>
and std::char_traits<char32_t> because <cstdint> guarantees to provide
the types we need, since r9-2028-g8ba7f29e3dd064.
Similarly, experimental::source_location can just assume uint_least32_t
is defined by <cstdint>.
libstdc++-v3/ChangeLog:
* include/bits/char_traits.h (char_traits<char16_t>): Do not
depend on _GLIBCXX_USE_C99_STDINT_TR1.
(char_traits<char32_t>): Likewise.
* include/experimental/source_location: Likewise.
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/experimental/source_location | 6 |
2 files changed, 2 insertions, 12 deletions
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h index 68ed827..0928137 100644 --- a/libstdc++-v3/include/bits/char_traits.h +++ b/libstdc++-v3/include/bits/char_traits.h @@ -762,10 +762,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef char16_t char_type; #ifdef __UINT_LEAST16_TYPE__ typedef __UINT_LEAST16_TYPE__ int_type; -#elif defined _GLIBCXX_USE_C99_STDINT_TR1 - typedef uint_least16_t int_type; #else - typedef make_unsigned<char16_t>::type int_type; + typedef uint_least16_t int_type; #endif #if _GLIBCXX_HOSTED typedef streamoff off_type; @@ -891,10 +889,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION typedef char32_t char_type; #ifdef __UINT_LEAST32_TYPE__ typedef __UINT_LEAST32_TYPE__ int_type; -#elif defined _GLIBCXX_USE_C99_STDINT_TR1 - typedef uint_least32_t int_type; #else - typedef make_unsigned<char32_t>::type int_type; + typedef uint_least32_t int_type; #endif #if _GLIBCXX_HOSTED typedef streamoff off_type; diff --git a/libstdc++-v3/include/experimental/source_location b/libstdc++-v3/include/experimental/source_location index 1dfce73..ee94a36 100644 --- a/libstdc++-v3/include/experimental/source_location +++ b/libstdc++-v3/include/experimental/source_location @@ -44,12 +44,6 @@ inline namespace fundamentals_v2 { struct source_location { -#ifndef _GLIBCXX_USE_C99_STDINT_TR1 - private: - using uint_least32_t = unsigned; - public: -#endif - // 14.1.2, source_location creation static constexpr source_location current(const char* __file = __builtin_FILE(), |