diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-14 12:01:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-07-14 12:01:55 (GMT) |
| commit | 13e9a370d9567d68120396b785c5d9e91a7cc5b8 (patch) | |
| tree | 5ecc0db10bdd7ba860c1c6423ee2609d8e00700c | |
| parent | 9d9085ab3614fa36d8b3e7e337468b53ae646b82 (diff) | |
| parent | 221ffabfad9ed61c6c1aed8b53e5402a943477bd (diff) | |
| download | CMake-13e9a370d9567d68120396b785c5d9e91a7cc5b8.zip CMake-13e9a370d9567d68120396b785c5d9e91a7cc5b8.tar.gz CMake-13e9a370d9567d68120396b785c5d9e91a7cc5b8.tar.bz2 | |
Merge branch 'TestDriver-fix-Wconversion' into release-3.9
| -rw-r--r-- | Templates/TestDriver.cxx.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in index 0d3f44f..bf61be4 100644 --- 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) */ |