diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-14 11:02:47 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-14 11:32:36 -0700 |
commit | 56e149a51562b9d2620bc9037a81735c29ea95af (patch) | |
tree | 3a4bd218f69c5cbfec0dd8dcada34413c0ddc715 /src/io/cxxstdio.hpp | |
parent | 1a1bfc8fd8a3613bf7d3c320dcaff29a9402f50c (diff) | |
download | tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.gz tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.bz2 tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.tar.xz tmwa-56e149a51562b9d2620bc9037a81735c29ea95af.zip |
Ditch gcc 4.6 support
Diffstat (limited to 'src/io/cxxstdio.hpp')
-rw-r--r-- | src/io/cxxstdio.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp index 66419df..a2faa18 100644 --- a/src/io/cxxstdio.hpp +++ b/src/io/cxxstdio.hpp @@ -192,7 +192,7 @@ namespace cxxstdio int print(T&& t, A&&... a) { constexpr static - const char *print_format = Format::print_format(); + const char *print_format = Format::print_format().format_string(); return do_print(std::forward<T>(t), print_format, decay_for_printf(convert_for_printf(std::forward<A>(a)))...); } @@ -207,7 +207,7 @@ namespace cxxstdio int scan(T&& t, A&&... a) { constexpr static - const char *scan_format = Format::scan_format(); + const char *scan_format = Format::scan_format().format_string(); return do_scan(std::forward<T>(t), scan_format, &convert_for_scanf(*a)...); } @@ -218,7 +218,7 @@ namespace cxxstdio struct format_impl \ { \ constexpr static \ - const char *print_format() { return fmt; } \ + FormatString print_format() { return fmt; } \ }; \ cxxstdio::PrintFormatter<format_impl>::print(out, ## __VA_ARGS__); \ }) @@ -228,7 +228,7 @@ namespace cxxstdio struct format_impl \ { \ constexpr static \ - const char *scan_format() { return fmt; } \ + FormatString scan_format() { return fmt; } \ }; \ cxxstdio::ScanFormatter<format_impl>::scan(out, ## __VA_ARGS__); \ }) |