]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Guard tr2::bases and tr2::direct_bases with __has_builtin
authorJonathan Wakely <jwakely@redhat.com>
Thu, 8 Feb 2024 15:38:35 +0000 (15:38 +0000)
committerJonathan Wakely <jwakely@redhat.com>
Thu, 8 Feb 2024 15:58:14 +0000 (15:58 +0000)
These non-standard extensions use GCC-specific built-ins. Use
__has_builtin to avoid errors when Clang compiles this header.

See https://github.com/llvm/llvm-project/issues/24289

libstdc++-v3/ChangeLog:

* include/tr2/type_traits (bases, direct_bases): Use
__has_builtin to check if required built-ins are supported.

libstdc++-v3/include/tr2/type_traits

index a7ebaf669471c9cf94f34242d39c32b69eb0f769..603039de8947c13a46ad94ed03e76ed6f924ce12 100644 (file)
@@ -82,20 +82,23 @@ namespace tr2
   /// Sequence abstraction metafunctions for manipulating a typelist.
 
 
-
+#if __has_builtin(__bases)
   /// Enumerate all the base classes of a class. Form of a typelist.
   template<typename _Tp>
     struct bases
     {
       typedef __reflection_typelist<__bases(_Tp)...>           type;
     };
+#endif
 
+#if __has_builtin(__direct_bases)
   /// Enumerate all the direct base classes of a class. Form of a typelist.
   template<typename _Tp>
     struct direct_bases
     {
       typedef __reflection_typelist<__direct_bases(_Tp)...>    type;
     };
+#endif
 
   /// @} group metaprogramming
 }