diff --git a/source/iostreams.tex b/source/iostreams.tex index 2ec4c6445e..ae467902c7 100644 --- a/source/iostreams.tex +++ b/source/iostreams.tex @@ -7801,7 +7801,7 @@ \effects Equivalent to: \begin{codeblock} -print(stream, runtime_format(string(fmt.get()) + '\n'), std::forward(args)...); +print(stream, dynamic_format(string(fmt.get()) + '\n'), std::forward(args)...); \end{codeblock} \end{itemdescr} diff --git a/source/support.tex b/source/support.tex index 6d83f3e90c..5fe180a0f8 100644 --- a/source/support.tex +++ b/source/support.tex @@ -678,7 +678,7 @@ #define @\defnlibxname{cpp_lib_filesystem}@ 201703L // also in \libheader{filesystem} #define @\defnlibxname{cpp_lib_flat_map}@ 202511L // also in \libheader{flat_map} #define @\defnlibxname{cpp_lib_flat_set}@ 202511L // also in \libheader{flat_set} -#define @\defnlibxname{cpp_lib_format}@ 202311L // also in \libheader{format} +#define @\defnlibxname{cpp_lib_format}@ 202603L // also in \libheader{format} #define @\defnlibxname{cpp_lib_format_path}@ 202506L // also in \libheader{filesystem} #define @\defnlibxname{cpp_lib_format_ranges}@ 202207L // also in \libheader{format} #define @\defnlibxname{cpp_lib_format_uchar}@ 202311L // also in \libheader{format} diff --git a/source/text.tex b/source/text.tex index df0dc1baea..ae8951ee4d 100644 --- a/source/text.tex +++ b/source/text.tex @@ -5751,18 +5751,18 @@ template struct basic_format_string; - template struct @\exposid{runtime-format-string}@ { // \expos + template struct @\exposid{dynamic-format-string}@ { // \expos private: basic_string_view @\exposid{str}@; // \expos public: - constexpr @\exposid{runtime-format-string}@(basic_string_view s) noexcept : @\exposid{str}@(s) {} - @\exposid{runtime-format-string}@(const @\exposid{runtime-format-string}@&) = delete; - @\exposid{runtime-format-string}@& operator=(const @\exposid{runtime-format-string}@&) = delete; + constexpr @\exposid{dynamic-format-string}@(basic_string_view s) noexcept : @\exposid{str}@(s) {} + @\exposid{dynamic-format-string}@(const @\exposid{dynamic-format-string}@&) = delete; + @\exposid{dynamic-format-string}@& operator=(const @\exposid{dynamic-format-string}@&) = delete; }; - constexpr @\exposid{runtime-format-string}@ - runtime_format(string_view fmt) noexcept { return fmt; } - constexpr @\exposid{runtime-format-string}@ - runtime_format(wstring_view fmt) noexcept { return fmt; } + constexpr @\exposid{dynamic-format-string}@ + dynamic_format(string_view fmt) noexcept { return fmt; } + constexpr @\exposid{dynamic-format-string}@ + dynamic_format(wstring_view fmt) noexcept { return fmt; } template using @\libglobal{format_string}@ = basic_format_string...>; @@ -6678,7 +6678,7 @@ public: template consteval basic_format_string(const T& s); - constexpr basic_format_string(@\exposid{runtime-format-string}@ s) noexcept : str(s.@\exposid{str}@) {} + constexpr basic_format_string(@\exposid{dynamic-format-string}@ s) noexcept : str(s.@\exposid{str}@) {} constexpr basic_string_view get() const noexcept { return @\exposid{str}@; } };