Commit c7bbce57 authored by Michael Tesch's avatar Michael Tesch
Browse files

Merge branch 'fix-fmt' into 'master' 

use FMT macros to pick correct constexpr

See merge request !28
parents f8fe2816 ab3d441a

duals/dual

+2 −2
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ struct fmt::formatter<duals::dual<T>,Char> : public fmt::formatter<T,Char> 
  typedef fmt::formatter<T,Char> base;

  enum style { expr, star, pair } style_ = expr;

  internal::dynamic_format_specs<Char> specs_;

  constexpr auto parse(format_parse_context & ctx) -> decltype(ctx.begin()) {

  FMT_CONSTEXPR auto parse(format_parse_context & ctx) -> decltype(ctx.begin()) {

    using handler_type = internal::dynamic_specs_handler<format_parse_context>;

    auto type = internal::type_constant<T, Char>::value;

    internal::specs_checker<handler_type> handler(handler_type(specs_, ctx), type);
@@ -1304,7 +1304,7 @@ struct fmt::formatter<std::complex<T>,Char> : public fmt::formatter<T,Char> 
  typedef fmt::formatter<T,Char> base;

  enum style { expr, star, pair } style_ = expr;

  internal::dynamic_format_specs<Char> specs_;

  constexpr auto parse(format_parse_context & ctx) -> decltype(ctx.begin()) {

  FMT_CONSTEXPR auto parse(format_parse_context & ctx) -> decltype(ctx.begin()) {

    using handler_type = internal::dynamic_specs_handler<format_parse_context>;

    auto type = internal::type_constant<T, Char>::value;

    internal::specs_checker<handler_type> handler(handler_type(specs_, ctx), type);

tests/bench_fmt.cpp

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ BENCHMARK_TEMPLATE(B_ios, duals::dual<double>); 


int main(int argc, char** argv)

{

  std::ios::sync_with_stdio(false);

  std::cout << "OPT_FLAGS=" << QUOTE(OPT_FLAGS) << "\n";

  ::benchmark::Initialize(&argc, argv);

  ::benchmark::RunSpecifiedBenchmarks();