Merge branch 'TestDriver-fix-Wconversion' into release-3.9

13e9a370 · Brad King · 9d9085ab · 221ffabf · 13e9a370
Commit 13e9a370 authored Jul 14, 2017 by Brad King
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Templates/TestDriver.cxx.in Templates/TestDriver.cxx.in +2 -2

No files found.
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -32,8 +32,8 @@ static functionMapEntry cmakeGeneratedFunctionMapEntries[] = {
  { NULL, NULL } /* NOLINT */
 };

-static const int NumTests =
-  (sizeof(cmakeGeneratedFunctionMapEntries) / sizeof(functionMapEntry)) - 1;
+static const int NumTests = CM_CAST(int,
+  sizeof(cmakeGeneratedFunctionMapEntries) / sizeof(functionMapEntry)) - 1;

 /* Allocate and create a lowercased copy of string
   (note that it has to be free'd manually) */