[gcc r13-3068] libstdc++: Fix test FAIL for old std::string ABI

Jonathan Wakely redi@gcc.gnu.org
Tue Oct 4 16:46:13 GMT 2022


https://gcc.gnu.org/g:5aa18176add650f481b3b9becbefce6d392cc049

commit r13-3068-g5aa18176add650f481b3b9becbefce6d392cc049
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Oct 4 17:23:45 2022 +0100

    libstdc++: Fix test FAIL for old std::string ABI
    
    libstdc++-v3/ChangeLog:
    
            * testsuite/std/ranges/adaptors/join_with/1.cc: Remove unused
            <sstream header.
            (test04): Remove constexpr for old std::string ABI and test at
            runtime.

Diff:
---
 libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
index efa350feb11..8b9c6c4fc9f 100644
--- a/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
+++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc
@@ -3,8 +3,7 @@
 
 #include <ranges>
 #include <algorithm>
-#include <sstream>
-#include <string_view>
+#include <string>
 #include <testsuite_hooks.h>
 #include <testsuite_iterators.h>
 
@@ -73,7 +72,10 @@ test03()
   return true;
 }
 
-constexpr bool
+#if _GLIBCXX_USE_CXX11_ABI
+constexpr
+#endif
+bool
 test04()
 {
   std::string rs[] = {"a", "", "b", "", "c"};
@@ -93,5 +95,9 @@ main()
   static_assert(test01());
   static_assert(test02());
   static_assert(test03());
+#if _GLIBCXX_USE_CXX11_ABI
   static_assert(test04());
+#else
+  VERIFY(test04());
+#endif
 }


More information about the Gcc-cvs mailing list