From ce2570b2071360c0b4bb4cd3c62ed8cccab26513 Mon Sep 17 00:00:00 2001
From: Regina Pfeifer <regina@mailbox.org>
Date: Tue, 20 Nov 2018 09:13:58 +0100
Subject: clang-tidy: Enable checks from bugprone set

---
 .clang-tidy                         | 3 +++
 Source/CTest/cmCTestTestHandler.cxx | 4 ++--
 Source/cmFileCommand.cxx            | 7 ++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index cec7d03..0ba4b0b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,8 @@
 ---
 Checks: "-*,\
+bugprone-*,\
+-bugprone-macro-parentheses,\
+-bugprone-misplaced-widening-cast,\
 google-readability-casting,\
 misc-*,\
 -misc-incorrect-roundings,\
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 1d938e6..2e1bb0a 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -3,6 +3,7 @@
 #include "cmCTestTestHandler.h"
 #include <algorithm>
 #include <chrono>
+#include <cmath>
 #include <cmsys/Base64.h>
 #include <cmsys/Directory.hxx>
 #include <cmsys/RegularExpression.hxx>
@@ -544,8 +545,7 @@ int cmCTestTestHandler::ProcessHandler()
     }
     cmCTestLog(this->CTest, HANDLER_OUTPUT,
                std::endl
-                 << passColorCode << static_cast<int>(percent + .5f)
-                 << "% tests passed"
+                 << passColorCode << std::lround(percent) << "% tests passed"
                  << this->CTest->GetColorCode(cmCTest::Color::CLEAR_COLOR)
                  << ", " << failedColorCode << failed.size() << " tests failed"
                  << this->CTest->GetColorCode(cmCTest::Color::CLEAR_COLOR)
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 3012b0a..fa2a3e1 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -10,6 +10,7 @@
 
 #include <algorithm>
 #include <assert.h>
+#include <cmath>
 #include <ctype.h>
 #include <memory> // IWYU pragma: keep
 #include <sstream>
@@ -2602,10 +2603,10 @@ public:
 
   bool UpdatePercentage(double value, double total, std::string& status)
   {
-    int OldPercentage = this->CurrentPercentage;
+    long OldPercentage = this->CurrentPercentage;
 
     if (total > 0.0) {
-      this->CurrentPercentage = static_cast<int>(value / total * 100.0 + 0.5);
+      this->CurrentPercentage = std::lround(value / total * 100.0);
       if (this->CurrentPercentage > 100) {
         // Avoid extra progress reports for unexpected data beyond total.
         this->CurrentPercentage = 100;
@@ -2627,7 +2628,7 @@ public:
   cmFileCommand* GetFileCommand() { return this->FileCommand; }
 
 private:
-  int CurrentPercentage;
+  long CurrentPercentage;
   cmFileCommand* FileCommand;
   std::string Text;
 };
-- 
cgit v0.12