commit 1995f7203e0912c8350a8b869e9704591a94b9d5
author Azat Khuzhin <a3at.mail@gmail.com> Fri Apr 08 16:13:46 2022 -0400
committer Copybara-Service <copybara-worker@google.com> Fri Apr 08 13:21:31 2022 -0700
tree e92fb8aafcdb752b5d0e6e6baf7305792b6c25a3
parent e31ce81ea38958b04aa6e2481cbc050908a1e0b5

[libc++] Avoid using anonymous struct with base classes (fixes GCC 12)

GCC 12 reports:

     libcxx/include/string:727:13: error: anonymous struct with base classes
     727 |             : __padding<value_type>

Differential Revision: https://reviews.llvm.org/D122598

NOKEYCHECK=True
GitOrigin-RevId: c3d0205ee771edbee287b389699eab70b3670ecf

include/string

diff --git a/include/string b/include/string
index 60b40c3..a005674 100644
--- a/include/string
+++ b/include/string
@@ -614,21 +614,6 @@
      !is_convertible<const _Tp&, const _CharT*>::value
     > {};
 
-#ifdef _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
-
-template <class _CharT, size_t = sizeof(_CharT)>
-struct __padding
-{
-    unsigned char __xx[sizeof(_CharT)-1];
-};
-
-template <class _CharT>
-struct __padding<_CharT, 1>
-{
-};
-
-#endif // _LIBCPP_ABI_ALTERNATE_STRING_LAYOUT
-
 #ifndef _LIBCPP_HAS_NO_CHAR8_T
 typedef basic_string<char8_t> u8string;
 #endif
@@ -702,11 +687,8 @@
     struct __short
     {
         value_type __data_[__min_cap];
-        struct
-            : __padding<value_type>
-        {
-            unsigned char __size_;
-        };
+        unsigned char __padding[sizeof(value_type) - 1];
+        unsigned char __size_;
     };
 
 #else