From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <redi@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2181)
	id 62D293858C2D; Tue,  4 Oct 2022 16:46:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62D293858C2D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org;
	s=default; t=1664901973;
	bh=uTOIwCc2WMbvtmnMXSb2G6OyZwB9E+36pAXRBarFwi4=;
	h=From:To:Subject:Date:From;
	b=Elt+Ih4fi5Qy+Id+/G0IHbniXMFdrodtedeg24ZJHwqO1LEQFOfUjiAaEMRwieZxl
	 5YxgrEU2+lCBDnijnZj7DtewVd1K0q87zsLXH85il7cogRhiox54Tgnx7p9TBn/APz
	 Y45gCZr4c9A5hS6Jx2+ecd7iDkdQjG0oXoMgSdtg=
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-3068] libstdc++: Fix test FAIL for old std::string ABI
X-Act-Checkin: gcc
X-Git-Author: Jonathan Wakely <jwakely@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 6ddbbbffbb5759a6c1d56c191364a6bd021f733e
X-Git-Newrev: 5aa18176add650f481b3b9becbefce6d392cc049
Message-Id: <20221004164613.62D293858C2D@sourceware.org>
Date: Tue,  4 Oct 2022 16:46:13 +0000 (GMT)
List-Id: <libstdc++-cvs.sourceware.org>

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
 }