diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-12-04 12:03:28 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-12-05 16:40:43 +0000 |
| commit | 3cd73543a1122d3c81409e3e9a26c3e94c3d324f (patch) | |
| tree | 48a2161f3fda8163ed573962164549bbba200511 | |
| parent | 9fff752695648b06a977b046990d69d41a1bf702 (diff) | |
| download | gcc-3cd73543a1122d3c81409e3e9a26c3e94c3d324f.zip gcc-3cd73543a1122d3c81409e3e9a26c3e94c3d324f.tar.gz gcc-3cd73543a1122d3c81409e3e9a26c3e94c3d324f.tar.bz2 | |
libstdc++: Disable std::formatter::set_debug_format [PR112832]
All set_debug_format member functions should be guarded by the
__cpp_lib_formatting_ranges macro (which is not defined yet).
libstdc++-v3/ChangeLog:
PR libstdc++/112832
* include/std/format (formatter::set_debug_format): Ensure this
member is defined conditionally for all specializations.
* testsuite/std/format/formatter/112832.cc: New test.
| -rw-r--r-- | libstdc++-v3/include/std/format | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/std/format/formatter/112832.cc | 29 |
2 files changed, 37 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 58cd310..01f0a58 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -1815,9 +1815,11 @@ namespace __format return _M_f.format(__u, __fc); } +#if __cpp_lib_format_ranges constexpr void set_debug_format() noexcept { _M_f._M_spec._M_type = __format::_Pres_esc; } +#endif private: __format::__formatter_int<wchar_t> _M_f; @@ -1843,7 +1845,9 @@ namespace __format format(_CharT* __u, basic_format_context<_Out, _CharT>& __fc) const { return _M_f.format(__u, __fc); } +#if __cpp_lib_format_ranges constexpr void set_debug_format() noexcept { _M_f.set_debug_format(); } +#endif private: __format::__formatter_str<_CharT> _M_f; @@ -1866,7 +1870,9 @@ namespace __format basic_format_context<_Out, _CharT>& __fc) const { return _M_f.format(__u, __fc); } +#if __cpp_lib_format_ranges constexpr void set_debug_format() noexcept { _M_f.set_debug_format(); } +#endif private: __format::__formatter_str<_CharT> _M_f; @@ -1888,7 +1894,9 @@ namespace __format basic_format_context<_Out, _CharT>& __fc) const { return _M_f.format({__u, _Nm}, __fc); } +#if __cpp_lib_format_ranges constexpr void set_debug_format() noexcept { _M_f.set_debug_format(); } +#endif private: __format::__formatter_str<_CharT> _M_f; diff --git a/libstdc++-v3/testsuite/std/format/formatter/112832.cc b/libstdc++-v3/testsuite/std/format/formatter/112832.cc new file mode 100644 index 0000000..9aa2095 --- /dev/null +++ b/libstdc++-v3/testsuite/std/format/formatter/112832.cc @@ -0,0 +1,29 @@ +// { dg-do compile { target c++20 } } + +#include <format> + +template<typename T, + typename C = std::remove_cvref_t<decltype(std::declval<T&>()[0])>> +constexpr bool +test_pr112832() +{ + std::formatter<T, C> f; + if constexpr (requires{ f.set_debug_format(); }) + f.set_debug_format(); + return true; +} + +int main() +{ + static_assert(test_pr112832<std::string_view>()); + static_assert(test_pr112832<char*>()); + static_assert(test_pr112832<const char*>()); + static_assert(test_pr112832<char[1]>()); +#ifdef _GLIBCXX_USE_WCHAR_T + static_assert(test_pr112832<std::wstring_view>()); + static_assert(test_pr112832<wchar_t*>()); + static_assert(test_pr112832<const wchar_t*>()); + static_assert(test_pr112832<wchar_t[1]>()); + static_assert(test_pr112832<char, wchar_t>()); +#endif +} |