@@ -682,11 +682,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_object
+#if __has_builtin(__is_function) && __has_builtin(__is_reference) \
+ && __has_builtin(__is_void)
+ template<typename _Tp>
+ struct is_object
+ : public __bool_constant<!(__is_function(_Tp) || __is_reference(_Tp) ||
+ __is_void(_Tp))>
+ { };
+#else
template<typename _Tp>
struct is_object
: public __not_<__or_<is_function<_Tp>, is_reference<_Tp>,
is_void<_Tp>>>::type
{ };
+#endif
template<typename>
struct is_member_pointer;
@@ -3235,8 +3244,17 @@ template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
+
+#if __has_builtin(__is_function) && __has_builtin(__is_reference) \
+ && __has_builtin(__is_void)
+template <typename _Tp>
+ inline constexpr bool is_object_v
+ = !(__is_function(_Tp) || __is_reference(_Tp) || __is_void(_Tp));
+#else
template <typename _Tp>
inline constexpr bool is_object_v = is_object<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
template <typename _Tp>
This patch gets std::is_object to dispatch to new built-in traits, __is_function, __is_reference, and __is_void. libstdc++-v3/ChangeLog: * include/std/type_traits (is_object): Use new built-in traits, __is_function, __is_reference, and __is_void. (is_object_v): Likewise. Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org> --- libstdc++-v3/include/std/type_traits | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)