Avoid implicit float to double conversion (#457)

Triggered by -Werror=double-promotion
This commit is contained in:
Raúl Marín 2017-10-13 17:17:02 +01:00 committed by Dominic Hamon
parent 0526755944
commit cacd321808
3 changed files with 3 additions and 1 deletions

View File

@ -10,6 +10,7 @@
Albert Pretorius <pretoalb@gmail.com> Albert Pretorius <pretoalb@gmail.com>
Arne Beer <arne@twobeer.de> Arne Beer <arne@twobeer.de>
Carto
Christopher Seymour <chris.j.seymour@hotmail.com> Christopher Seymour <chris.j.seymour@hotmail.com>
David Coeurjolly <david.coeurjolly@liris.cnrs.fr> David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
Dirac Research Dirac Research

View File

@ -50,6 +50,7 @@ Pascal Leroy <phl@google.com>
Paul Redmond <paul.redmond@gmail.com> Paul Redmond <paul.redmond@gmail.com>
Pierre Phaneuf <pphaneuf@google.com> Pierre Phaneuf <pphaneuf@google.com>
Radoslav Yovchev <radoslav.tm@gmail.com> Radoslav Yovchev <radoslav.tm@gmail.com>
Raul Marin <rmrodriguez@cartodb.com>
Ray Glover <ray.glover@uk.ibm.com> Ray Glover <ray.glover@uk.ibm.com>
Shuo Chen <chenshuo@chenshuo.com> Shuo Chen <chenshuo@chenshuo.com>
Tobias Ulvgård <tobias.ulvgard@dirac.se> Tobias Ulvgård <tobias.ulvgard@dirac.se>

View File

@ -491,7 +491,7 @@ void RunBenchmarks(const std::vector<Benchmark::Instance>& benchmarks,
// Print header here // Print header here
BenchmarkReporter::Context context; BenchmarkReporter::Context context;
context.num_cpus = NumCPUs(); context.num_cpus = NumCPUs();
context.mhz_per_cpu = CyclesPerSecond() / 1000000.0f; context.mhz_per_cpu = CyclesPerSecond() / 1000000.0;
context.cpu_scaling_enabled = CpuScalingEnabled(); context.cpu_scaling_enabled = CpuScalingEnabled();
context.name_field_width = name_field_width; context.name_field_width = name_field_width;