From 4d06360c926f15f95aeaf08eaef5274cb534ee5e Mon Sep 17 00:00:00 2001 From: Vasily Date: Mon, 18 Feb 2019 19:08:57 +0100 Subject: [PATCH] Fix gcc and clang -Wdouble-promotion --- src/tabcontrollers/UtilitiesTabController.cpp | 3 ++- third-party/easylogging++/easylogging++.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp index 065d309..68f379c 100644 --- a/src/tabcontrollers/UtilitiesTabController.cpp +++ b/src/tabcontrollers/UtilitiesTabController.cpp @@ -534,7 +534,8 @@ void UtilitiesTabController::eventLoopTick() i, vr::ETrackedDeviceProperty:: Prop_DeviceBatteryPercentage_Float ); - int batteryState = ceil( battery * 5 ); + int batteryState = static_cast( + ceil( static_cast( battery * 5 ) ) ); if ( batteryState != m_batteryState[i] ) { diff --git a/third-party/easylogging++/easylogging++.cc b/third-party/easylogging++/easylogging++.cc index 6e85715..fcbb6da 100644 --- a/third-party/easylogging++/easylogging++.cc +++ b/third-party/easylogging++/easylogging++.cc @@ -1202,7 +1202,7 @@ base::type::string_t DateTime::formatTime(unsigned long long time, base::Timesta if (time <= base::consts::kTimeFormats[i].value) { break; } - if (base::consts::kTimeFormats[i].value == 1000.0f && time / 1000.0f < 1.9f) { + if (base::consts::kTimeFormats[i].value == 1000.0 && time / 1000.0f < 1.9f) { break; } time /= static_cast(base::consts::kTimeFormats[i].value);