fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-31 03:07:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

constrain templated format_to on proper format string type.

Browse Source 
Signed-off-by: Daniela Engert <dani@ngrt.de>
This commit is contained in:
Daniela Engert
2018-09-25 17:47:53 +02:00
committed by Victor Zverovich
parent d7f17613f5
commit 4cf21f58b2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/color.h
View File

@ -266,10 +266,6 @@ template <>
inline void reset_color<wchar_t>(FILE *stream) FMT_NOEXCEPT { inline void reset_color<wchar_t>(FILE *stream) FMT_NOEXCEPT {
fputs(internal::data::WRESET_COLOR, stream); fputs(internal::data::WRESET_COLOR, stream);
} }
template <typename S>
struct is_format_string: std::integral_constant<
bool, std::is_empty<format_string_traits<S>>::value> {};
} // namespace internal } // namespace internal
template < template <

3
include/fmt/core.h
View File

@ -1285,6 +1285,9 @@ struct format_string_traits<
basic_string_view<typename S::char_type>, S>::value>::type> : basic_string_view<typename S::char_type>, S>::value>::type> :
format_string_traits_base<typename S::char_type> {}; format_string_traits_base<typename S::char_type> {};
template <typename S>
struct is_format_string : std::is_empty<format_string_traits<S>> {};
template <typename S> template <typename S>
struct is_compile_string : struct is_compile_string :
std::integral_constant<bool, std::is_base_of<compile_string, S>::value> {}; std::integral_constant<bool, std::is_base_of<compile_string, S>::value> {};

3
include/fmt/format.h
View File

@ -3507,7 +3507,8 @@ inline OutputIt vformat_to(
\endrst \endrst
*/ */
template <typename OutputIt, typename String, typename... Args> template <typename OutputIt, typename String, typename... Args>
inline OutputIt format_to(OutputIt out, const String &format_str, inline typename std::enable_if<internal::is_format_string<String>::value, OutputIt>::type
format_to(OutputIt out, const String &format_str,
const Args &... args) { const Args &... args) {
internal::check_format_string<Args...>(format_str); internal::check_format_string<Args...>(format_str);
typedef typename format_context_t<OutputIt, FMT_CHAR(String) >::type context_t; typedef typename format_context_t<OutputIt, FMT_CHAR(String) >::type context_t;