diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2018-05-04 19:02:23 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2018-05-05 00:34:22 +0200 |
| commit | 5f9c05db78926dfb063fdd0493ecc6b8e12c2e02 (patch) | |
| tree | a05f9b87d660dc1f4b7cb20de1f8c59eec5ea7a7 | |
| parent | 1d77c915005f7630949e2ce706055ee3235009b6 (diff) | |
Avoid implicitly promotion of float to double
Reported-By: gcc -Wdouble-promotion
Gbp-Dch: Ignore
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/progress.cc | 2 | ||||
| -rw-r--r-- | apt-pkg/install-progress.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ecfa5ed1d..3607bba2b 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 5499f0946..6743889b8 100644 --- a/apt-pkg/contrib/progress.cc +++ b/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; diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc index f9c8b6d96..2e8fac236 100644 --- a/apt-pkg/install-progress.cc +++ b/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) << " "; |