@@ -3787,6 +3787,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_POD:
inform (loc, " %qT is not a POD type", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_POLYMORPHIC:
inform (loc, " %qT is not a polymorphic type", t1);
break;
@@ -81,6 +81,7 @@ DEFTRAIT_EXPR (IS_NOTHROW_CONSTRUCTIBLE, "__is_nothrow_constructible", -1)
DEFTRAIT_EXPR (IS_NOTHROW_CONVERTIBLE, "__is_nothrow_convertible", 2)
DEFTRAIT_EXPR (IS_POINTER_INTERCONVERTIBLE_BASE_OF, "__is_pointer_interconvertible_base_of", 2)
DEFTRAIT_EXPR (IS_POD, "__is_pod", 1)
+DEFTRAIT_EXPR (IS_POINTER, "__is_pointer", 1)
DEFTRAIT_EXPR (IS_POLYMORPHIC, "__is_polymorphic", 1)
DEFTRAIT_EXPR (IS_REFERENCE, "__is_reference", 1)
DEFTRAIT_EXPR (IS_SAME, "__is_same", 2)
@@ -62,6 +62,7 @@ struct cp_trait {
"__is_nothrow_convertible", CPTK_IS_NOTHROW_CONVERTIBLE, true, false, false
"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, true, false, false
"__is_pod", CPTK_IS_POD, false, false, false
+"__is_pointer", CPTK_IS_POINTER, false, false, false
"__is_polymorphic", CPTK_IS_POLYMORPHIC, false, false, false
"__is_reference", CPTK_IS_REFERENCE, false, false, false
"__is_same", CPTK_IS_SAME, true, false, false
@@ -56,7 +56,7 @@ struct cp_trait {
bool variadic;
bool type;
};
-/* maximum key range = 109, duplicates = 0 */
+/* maximum key range = 92, duplicates = 0 */
class cp_trait_lookup
{
@@ -71,32 +71,32 @@ cp_trait_lookup::hash (const char *str, size_t len)
{
static const unsigned char asso_values[] =
{
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 20, 116, 40, 5, 40,
- 50, 0, 55, 10, 116, 0, 116, 116, 5, 25,
- 30, 0, 5, 116, 10, 15, 5, 0, 25, 116,
- 116, 20, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
- 116, 116, 116, 116, 116, 116
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 20, 99, 40, 45, 40,
+ 5, 0, 55, 10, 99, 0, 99, 99, 10, 25,
+ 30, 0, 10, 99, 10, 15, 5, 0, 20, 99,
+ 99, 10, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
+ 99, 99, 99, 99, 99, 99
};
unsigned int hval = len;
@@ -118,78 +118,78 @@ cp_trait_lookup::find (const char *str, size_t len)
{
enum
{
- TOTAL_KEYWORDS = 57,
+ TOTAL_KEYWORDS = 58,
MIN_WORD_LENGTH = 7,
MAX_WORD_LENGTH = 37,
MIN_HASH_VALUE = 7,
- MAX_HASH_VALUE = 115
+ MAX_HASH_VALUE = 98
};
static const struct cp_trait wordlist[] =
{
-#line 86 "../../gcc/cp/cp-trait.gperf"
+#line 87 "../../gcc/cp/cp-trait.gperf"
{"__bases", CPTK_BASES, false, false, true},
#line 52 "../../gcc/cp/cp-trait.gperf"
{"__is_enum", CPTK_IS_ENUM, false, false, false},
-#line 75 "../../gcc/cp/cp-trait.gperf"
+#line 76 "../../gcc/cp/cp-trait.gperf"
{"__is_union", CPTK_IS_UNION, false, false, false},
-#line 79 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cv", CPTK_REMOVE_CV, false, false, true},
#line 80 "../../gcc/cp/cp-trait.gperf"
- {"__remove_cvref", CPTK_REMOVE_CVREF, false, false, true},
-#line 51 "../../gcc/cp/cp-trait.gperf"
- {"__is_empty", CPTK_IS_EMPTY, false, false, false},
+ {"__remove_cv", CPTK_REMOVE_CV, false, false, true},
#line 81 "../../gcc/cp/cp-trait.gperf"
+ {"__remove_cvref", CPTK_REMOVE_CVREF, false, false, true},
+#line 82 "../../gcc/cp/cp-trait.gperf"
{"__remove_pointer", CPTK_REMOVE_POINTER, false, false, true},
-#line 70 "../../gcc/cp/cp-trait.gperf"
+#line 71 "../../gcc/cp/cp-trait.gperf"
{"__is_trivial", CPTK_IS_TRIVIAL, false, false, false},
-#line 82 "../../gcc/cp/cp-trait.gperf"
+#line 83 "../../gcc/cp/cp-trait.gperf"
{"__remove_reference", CPTK_REMOVE_REFERENCE, false, false, true},
-#line 87 "../../gcc/cp/cp-trait.gperf"
+#line 88 "../../gcc/cp/cp-trait.gperf"
{"__direct_bases", CPTK_DIRECT_BASES, false, false, true},
-#line 84 "../../gcc/cp/cp-trait.gperf"
+#line 51 "../../gcc/cp/cp-trait.gperf"
+ {"__is_empty", CPTK_IS_EMPTY, false, false, false},
+#line 65 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pointer", CPTK_IS_POINTER, false, false, false},
+#line 64 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pod", CPTK_IS_POD, false, false, false},
+#line 86 "../../gcc/cp/cp-trait.gperf"
+ {"__is_deducible ", CPTK_IS_DEDUCIBLE, true, false, false},
+#line 85 "../../gcc/cp/cp-trait.gperf"
{"__underlying_type", CPTK_UNDERLYING_TYPE, false, false, true},
-#line 46 "../../gcc/cp/cp-trait.gperf"
- {"__is_bounded_array", CPTK_IS_BOUNDED_ARRAY, false, false, false},
-#line 83 "../../gcc/cp/cp-trait.gperf"
- {"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, false, true, true},
#line 74 "../../gcc/cp/cp-trait.gperf"
- {"__is_unbounded_array", CPTK_IS_UNBOUNDED_ARRAY, false, false, false},
-#line 65 "../../gcc/cp/cp-trait.gperf"
- {"__is_polymorphic", CPTK_IS_POLYMORPHIC, false, false, false},
-#line 56 "../../gcc/cp/cp-trait.gperf"
- {"__is_literal_type", CPTK_IS_LITERAL_TYPE, false, false, false},
-#line 73 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_copyable", CPTK_IS_TRIVIALLY_COPYABLE, false, false, false},
-#line 71 "../../gcc/cp/cp-trait.gperf"
+#line 84 "../../gcc/cp/cp-trait.gperf"
+ {"__type_pack_element", CPTK_TYPE_PACK_ELEMENT, false, true, true},
+#line 72 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_assignable", CPTK_IS_TRIVIALLY_ASSIGNABLE, true, false, false},
-#line 68 "../../gcc/cp/cp-trait.gperf"
+#line 69 "../../gcc/cp/cp-trait.gperf"
{"__is_scoped_enum", CPTK_IS_SCOPED_ENUM, false, false, false},
-#line 45 "../../gcc/cp/cp-trait.gperf"
- {"__is_base_of", CPTK_IS_BASE_OF, true, false, false},
-#line 72 "../../gcc/cp/cp-trait.gperf"
+#line 56 "../../gcc/cp/cp-trait.gperf"
+ {"__is_literal_type", CPTK_IS_LITERAL_TYPE, false, false, false},
+#line 73 "../../gcc/cp/cp-trait.gperf"
{"__is_trivially_constructible", CPTK_IS_TRIVIALLY_CONSTRUCTIBLE, false, true, false},
-#line 78 "../../gcc/cp/cp-trait.gperf"
+#line 79 "../../gcc/cp/cp-trait.gperf"
{"__reference_converts_from_temporary", CPTK_REF_CONVERTS_FROM_TEMPORARY, true, false, false},
-#line 77 "../../gcc/cp/cp-trait.gperf"
+#line 66 "../../gcc/cp/cp-trait.gperf"
+ {"__is_polymorphic", CPTK_IS_POLYMORPHIC, false, false, false},
+#line 78 "../../gcc/cp/cp-trait.gperf"
{"__reference_constructs_from_temporary", CPTK_REF_CONSTRUCTS_FROM_TEMPORARY, true, false, false},
#line 34 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_copy", CPTK_HAS_NOTHROW_COPY, false, false, false},
#line 32 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_assign", CPTK_HAS_NOTHROW_ASSIGN, false, false, false},
-#line 63 "../../gcc/cp/cp-trait.gperf"
- {"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, true, false, false},
-#line 76 "../../gcc/cp/cp-trait.gperf"
+#line 55 "../../gcc/cp/cp-trait.gperf"
+ {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, true, false, false},
+#line 77 "../../gcc/cp/cp-trait.gperf"
{"__is_volatile", CPTK_IS_VOLATILE, false, false, false},
#line 40 "../../gcc/cp/cp-trait.gperf"
{"__has_virtual_destructor", CPTK_HAS_VIRTUAL_DESTRUCTOR, false, false, false},
#line 33 "../../gcc/cp/cp-trait.gperf"
{"__has_nothrow_constructor", CPTK_HAS_NOTHROW_CONSTRUCTOR, false, false, false},
-#line 55 "../../gcc/cp/cp-trait.gperf"
- {"__is_layout_compatible", CPTK_IS_LAYOUT_COMPATIBLE, true, false, false},
+#line 63 "../../gcc/cp/cp-trait.gperf"
+ {"__is_pointer_interconvertible_base_of", CPTK_IS_POINTER_INTERCONVERTIBLE_BASE_OF, true, false, false},
#line 37 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_copy", CPTK_HAS_TRIVIAL_COPY, false, false, false},
-#line 67 "../../gcc/cp/cp-trait.gperf"
+#line 68 "../../gcc/cp/cp-trait.gperf"
{"__is_same", CPTK_IS_SAME, true, false, false},
#line 35 "../../gcc/cp/cp-trait.gperf"
{"__has_trivial_assign", CPTK_HAS_TRIVIAL_ASSIGN, false, false, false},
@@ -207,23 +207,27 @@ cp_trait_lookup::find (const char *str, size_t len)
{"__is_array", CPTK_IS_ARRAY, false, false, false},
#line 61 "../../gcc/cp/cp-trait.gperf"
{"__is_nothrow_constructible", CPTK_IS_NOTHROW_CONSTRUCTIBLE, false, true, false},
-#line 64 "../../gcc/cp/cp-trait.gperf"
- {"__is_pod", CPTK_IS_POD, false, false, false},
+#line 46 "../../gcc/cp/cp-trait.gperf"
+ {"__is_bounded_array", CPTK_IS_BOUNDED_ARRAY, false, false, false},
#line 42 "../../gcc/cp/cp-trait.gperf"
{"__is_aggregate", CPTK_IS_AGGREGATE, false, false, false},
+#line 75 "../../gcc/cp/cp-trait.gperf"
+ {"__is_unbounded_array", CPTK_IS_UNBOUNDED_ARRAY, false, false, false},
#line 41 "../../gcc/cp/cp-trait.gperf"
{"__is_abstract", CPTK_IS_ABSTRACT, false, false, false},
#line 59 "../../gcc/cp/cp-trait.gperf"
{"__is_member_pointer", CPTK_IS_MEMBER_POINTER, false, false, false},
#line 44 "../../gcc/cp/cp-trait.gperf"
{"__is_assignable", CPTK_IS_ASSIGNABLE, true, false, false},
-#line 69 "../../gcc/cp/cp-trait.gperf"
+#line 45 "../../gcc/cp/cp-trait.gperf"
+ {"__is_base_of", CPTK_IS_BASE_OF, true, false, false},
+#line 70 "../../gcc/cp/cp-trait.gperf"
{"__is_standard_layout", CPTK_IS_STD_LAYOUT, false, false, false},
#line 58 "../../gcc/cp/cp-trait.gperf"
{"__is_member_object_pointer", CPTK_IS_MEMBER_OBJECT_POINTER, false, false, false},
#line 57 "../../gcc/cp/cp-trait.gperf"
{"__is_member_function_pointer", CPTK_IS_MEMBER_FUNCTION_POINTER, false, false, false},
-#line 66 "../../gcc/cp/cp-trait.gperf"
+#line 67 "../../gcc/cp/cp-trait.gperf"
{"__is_reference", CPTK_IS_REFERENCE, false, false, false},
#line 48 "../../gcc/cp/cp-trait.gperf"
{"__is_const", CPTK_IS_CONST, false, false, false},
@@ -238,22 +242,19 @@ cp_trait_lookup::find (const char *str, size_t len)
#line 53 "../../gcc/cp/cp-trait.gperf"
{"__is_final", CPTK_IS_FINAL, false, false, false},
#line 54 "../../gcc/cp/cp-trait.gperf"
- {"__is_function", CPTK_IS_FUNCTION, false, false, false},
-#line 85 "../../gcc/cp/cp-trait.gperf"
- {"__is_deducible ", CPTK_IS_DEDUCIBLE, true, false, false}
+ {"__is_function", CPTK_IS_FUNCTION, false, false, false}
};
static const signed char lookup[] =
{
-1, -1, -1, -1, -1, -1, -1, 0, -1, 1, 2, 3, -1, -1,
- 4, 5, 6, 7, 8, 9, -1, -1, 10, 11, 12, 13, 14, 15,
- 16, -1, 17, 18, 19, 20, -1, 21, -1, 22, 23, -1, 24, -1,
+ 4, -1, 5, 6, 7, 8, 9, -1, 10, 11, -1, 12, -1, 13,
+ 14, 15, 16, 17, 18, 19, -1, 20, 21, 22, 23, -1, 24, -1,
25, 26, 27, 28, -1, 29, 30, 31, 32, -1, 33, -1, 34, 35,
- -1, -1, 36, 37, 38, 39, -1, 40, 41, -1, -1, -1, 42, 43,
- 44, -1, -1, -1, -1, 45, 46, -1, 47, 48, 49, -1, -1, -1,
- -1, 50, 51, -1, 52, -1, 53, -1, -1, -1, -1, 54, -1, -1,
- 55, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 56
+ -1, -1, 36, 37, 38, 39, -1, 40, 41, 42, -1, -1, 43, 44,
+ 45, -1, 46, -1, -1, 47, 48, -1, 49, 50, 51, -1, -1, -1,
+ -1, 52, 53, -1, 54, -1, 55, -1, -1, -1, -1, 56, -1, -1,
+ 57
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12211,6 +12211,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_POD:
return pod_type_p (type1);
+ case CPTK_IS_POINTER:
+ return TYPE_PTR_P (type1);
+
case CPTK_IS_POLYMORPHIC:
return CLASS_TYPE_P (type1) && TYPE_POLYMORPHIC_P (type1);
@@ -12412,6 +12415,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_MEMBER_FUNCTION_POINTER:
case CPTK_IS_MEMBER_OBJECT_POINTER:
case CPTK_IS_MEMBER_POINTER:
+ case CPTK_IS_POINTER:
case CPTK_IS_REFERENCE:
case CPTK_IS_SAME:
case CPTK_IS_SCOPED_ENUM:
@@ -122,6 +122,9 @@
#if !__has_builtin (__is_pod)
# error "__has_builtin (__is_pod) failed"
#endif
+#if !__has_builtin (__is_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
#if !__has_builtin (__is_polymorphic)
# error "__has_builtin (__is_polymorphic) failed"
#endif
new file mode 100644
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && __is_ptr<_II>::__value
+ && __is_ptr<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && __is_ptr<_BI1>::__value
+ && __is_ptr<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
};
- template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
+ template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> > {
};
}
namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
//
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && __is_ptr<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && __is_ptr<_Ptr1>::__value
+ && __is_ptr<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1217,7 +1217,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || __is_ptr<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1380,8 +1380,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with