Browse Source

Avoid implicitly promotion of float to double

Reported-By: gcc -Wdouble-promotion
Gbp-Dch: Ignore
debian/1.8.y
David Kalnischkies 4 years ago
parent
commit
5f9c05db78
  1. 1
      CMakeLists.txt
  2. 2
      apt-pkg/contrib/progress.cc
  3. 2
      apt-pkg/install-progress.cc

1
CMakeLists.txt

@ -68,6 +68,7 @@ add_optional_compile_options(Wmissing-include-dirs)
add_optional_compile_options(Wnoexcept)
add_optional_compile_options(Wsign-promo)
add_optional_compile_options(Wundef)
add_optional_compile_options(Wdouble-promotion)
# apt-ftparchive dependencies
find_package(BerkeleyDB REQUIRED)

2
apt-pkg/contrib/progress.cc

@ -118,7 +118,7 @@ bool OpProgress::CheckChange(float Interval)
// Check time delta
struct timeval Now;
gettimeofday(&Now,0);
double Diff = Now.tv_sec - LastTime.tv_sec + (Now.tv_usec - LastTime.tv_usec)/1000000.0;
decltype(Interval) const Diff = Now.tv_sec - LastTime.tv_sec + (Now.tv_usec - LastTime.tv_usec)/1000000.0;
if (Diff < Interval)
return false;
LastTime = Now;

2
apt-pkg/install-progress.cc

@ -383,7 +383,7 @@ bool PackageManagerFancy::DrawStatusLine()
{
int padding = 4;
auto const progressbar_size = size.columns - padding - progress_str.size();
auto const current_percent = percentage / 100.0;
auto const current_percent = percentage / 100.0f;
std::cout << " "
<< GetTextProgressStr(current_percent, progressbar_size)
<< " ";

Loading…
Cancel
Save