[gcc(refs/users/ppalka/heads/integer_class_type)] Remove _GLIBCXX_INTEGER_LIKE_TYPES
Patrick Palka
ppalka@gcc.gnu.org
Thu Jan 16 20:35:00 GMT 2020
https://gcc.gnu.org/g:bc17d0077bfa25f662ca7e60b159585482446881
commit bc17d0077bfa25f662ca7e60b159585482446881
Author: Patrick Palka <ppalka@gcc.gnu.org>
Date: Thu Jan 16 15:29:38 2020 -0500
Remove _GLIBCXX_INTEGER_LIKE_TYPES
Diff:
---
libstdc++-v3/include/bits/iterator_concepts.h | 12 ++----------
libstdc++-v3/include/bits/range_access.h | 3 ---
libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h
index c7d14f5..32cf02c 100644
--- a/libstdc++-v3/include/bits/iterator_concepts.h
+++ b/libstdc++-v3/include/bits/iterator_concepts.h
@@ -494,27 +494,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace ranges::__detail
{
-#ifdef _GLIBCXX_INTEGER_LIKE_TYPES
class __max_diff_type;
class __max_size_type;
-#elif __SIZEOF_INT128__
- using __max_diff_type = __int128;
- using __max_size_type = unsigned __int128;
-#else
- using __max_diff_type = long long;
- using __max_size_type = unsigned long long;
-#endif
template<typename _Tp>
concept __is_integer_like = integral<_Tp>
-#if defined _GLIBCXX_INTEGER_LIKE_TYPES && __SIZEOF_INT128__
+#if __SIZEOF_INT128__
|| same_as<_Tp, __int128> || same_as<_Tp, unsigned __int128>
#endif
|| same_as<_Tp, __max_diff_type> || same_as<_Tp, __max_size_type>;
template<typename _Tp>
concept __is_signed_integer_like = signed_integral<_Tp>
-#if defined _GLIBCXX_INTEGER_LIKE_TYPES && __SIZEOF_INT128__
+#if __SIZEOF_INT128__
|| same_as<_Tp, __int128>
#endif
|| same_as<_Tp, __max_diff_type>;
diff --git a/libstdc++-v3/include/bits/range_access.h b/libstdc++-v3/include/bits/range_access.h
index a908718..003835a 100644
--- a/libstdc++-v3/include/bits/range_access.h
+++ b/libstdc++-v3/include/bits/range_access.h
@@ -347,7 +347,6 @@ namespace ranges
namespace __detail
{
-#ifdef _GLIBCXX_INTEGER_LIKE_TYPES
class __max_size_type
{
public:
@@ -886,8 +885,6 @@ namespace ranges
__to_unsigned_like(__max_diff_type __t) noexcept
{ return __max_size_type(__t); }
-#endif // _GLIBCXX_INTEGER_LIKE_TYPES
-
template<integral _Tp>
constexpr make_unsigned_t<_Tp>
__to_unsigned_like(_Tp __t) noexcept
diff --git a/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc b/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
index 08cc49d..9efcd5f 100644
--- a/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
+++ b/libstdc++-v3/testsuite/std/ranges/iota/difference_type.cc
@@ -15,7 +15,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
-// { dg-options "-std=gnu++2a -D_GLIBCXX_INTEGER_LIKE_TYPES=1" }
+// { dg-options "-std=gnu++2a" }
// { dg-do run { target c++2a } }
#include <ranges>
More information about the Libstdc++-cvs
mailing list