diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2022-10-04 17:23:45 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2022-10-04 17:43:00 +0100 |
commit | 5aa18176add650f481b3b9becbefce6d392cc049 (patch) | |
tree | ca47dbaf3694dd12eeae248a4aff4df6b7a54bdc | |
parent | 6ddbbbffbb5759a6c1d56c191364a6bd021f733e (diff) | |
download | gcc-5aa18176add650f481b3b9becbefce6d392cc049.zip gcc-5aa18176add650f481b3b9becbefce6d392cc049.tar.gz gcc-5aa18176add650f481b3b9becbefce6d392cc049.tar.bz2 |
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.
-rw-r--r-- | libstdc++-v3/testsuite/std/ranges/adaptors/join_with/1.cc | 12 |
1 files 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 efa350f..8b9c6c4 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 } |