diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-12-12 11:40:07 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-12-12 14:00:09 +0000 |
| commit | 6c0f9584013dbedeacacb041d40ce9005b902df0 (patch) | |
| tree | 1003cfda13d587fa51ecd0938369f8c806f53746 | |
| parent | cb363fd9f19eb791e1ee1eb0d5c61f5fdf21af32 (diff) | |
| download | gcc-6c0f9584013dbedeacacb041d40ce9005b902df0.zip gcc-6c0f9584013dbedeacacb041d40ce9005b902df0.tar.gz gcc-6c0f9584013dbedeacacb041d40ce9005b902df0.tar.bz2 | |
libstdc++: Fix constraint on std::basic_format_string [PR108024]
Also remove some redundant std::move calls for return statements.
libstdc++-v3/ChangeLog:
PR libstdc++/108024
* include/std/format (basic_format_string): Fix constraint.
* testsuite/std/format/format_string.cc: New test.
| -rw-r--r-- | libstdc++-v3/include/std/format | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/format/format_string.cc | 16 |
2 files changed, 22 insertions, 4 deletions
diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 269f8f6..9c92837 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -110,7 +110,8 @@ namespace __format template<typename _CharT, typename... _Args> struct basic_format_string { - template<convertible_to<basic_string_view<_CharT>> _Tp> + template<typename _Tp> + requires convertible_to<const _Tp&, basic_string_view<_CharT>> consteval basic_format_string(const _Tp& __s); @@ -609,7 +610,7 @@ namespace __format else for (_CharT __c : __str) *__out++ = __c; - return std::move(__out); + return __out; } // Write STR to OUT with NFILL copies of FILL_CHAR specified by ALIGN. @@ -664,7 +665,7 @@ namespace __format __out = __format::__write(std::move(__out), __str); __pad(__r, __out); - return std::move(__out); + return __out; } // A lightweight optional<locale>. @@ -3626,7 +3627,8 @@ namespace __format /// @endcond template<typename _CharT, typename... _Args> - template<convertible_to<basic_string_view<_CharT>> _Tp> + template<typename _Tp> + requires convertible_to<const _Tp&, basic_string_view<_CharT>> consteval basic_format_string<_CharT, _Args...>:: basic_format_string(const _Tp& __s) diff --git a/libstdc++-v3/testsuite/std/format/format_string.cc b/libstdc++-v3/testsuite/std/format/format_string.cc new file mode 100644 index 0000000..1dd6ca8 --- /dev/null +++ b/libstdc++-v3/testsuite/std/format/format_string.cc @@ -0,0 +1,16 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include <format> + +struct Str +{ + consteval operator std::string_view() const { return ""; } + operator std::string_view() = delete; +}; + +// PR libstdc++/108024 +static_assert( std::is_constructible_v<std::format_string<>, const Str&> ); +static_assert( std::is_convertible_v<const Str&, std::format_string<>> ); + +constinit std::format_string<> s = Str(); |