diff options
author | Brad King <brad.king@kitware.com> | 2017-05-25 19:14:08 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-25 19:14:22 (GMT) |
commit | 1aa9eb33e048df243f94200348a2bb7a65f0cdb8 (patch) | |
tree | d38be42ebc592a13ff9bac5058d87f12401fffdc | |
parent | d6df882addb0780ca324b3e6490221d7801acf86 (diff) | |
parent | aa7e9a9674ac2317579442fe9e102e5c3be7fd39 (diff) | |
download | CMake-1aa9eb33e048df243f94200348a2bb7a65f0cdb8.zip CMake-1aa9eb33e048df243f94200348a2bb7a65f0cdb8.tar.gz CMake-1aa9eb33e048df243f94200348a2bb7a65f0cdb8.tar.bz2 |
Merge topic 'server-fix-warning'
aa7e9a96 cmServer: Fix compiler -Wdouble-promotion warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !885
-rw-r--r-- | Source/cmServer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx index 19bdd45..7fc6ed7 100644 --- a/Source/cmServer.cxx +++ b/Source/cmServer.cxx @@ -147,7 +147,7 @@ void cmServer::reportProgress(const char* msg, float progress, void* data) { const cmServerRequest* request = static_cast<const cmServerRequest*>(data); assert(request); - if (progress < 0.0 || progress > 1.0) { + if (progress < 0.0f || progress > 1.0f) { request->ReportMessage(msg, ""); } else { request->ReportProgress(0, static_cast<int>(progress * 1000), 1000, msg); |