diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-19 16:46:11 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-19 12:47:21 -0400 |
| commit | 9484e43731bf2600d2bc52a44c86044f9abc5f4b (patch) | |
| tree | daadb3b335284f40042db56d041070a4cf5767a7 /Templates | |
| parent | 6004b997b011b5a54ee12089ef49e32730d29121 (diff) | |
| parent | 0bb3d457cbc57246c32a4d51d55390c40396043e (diff) | |
| download | cmake-9484e43731bf2600d2bc52a44c86044f9abc5f4b.tar.gz | |
Merge topic 'TestDriver-time.h-lint' into release-3.21
0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage
32ff836e2a TestDriver: suppress deprecated header lints for time.h
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6352
Diffstat (limited to 'Templates')
| -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 61134172ed..6ced8001ca 100644 --- a/Templates/TestDriver.cxx.in +++ b/Templates/TestDriver.cxx.in @@ -2,7 +2,7 @@ #include <stdio.h> /* NOLINT */ #include <stdlib.h> /* NOLINT */ #include <string.h> /* NOLINT */ -#include <time.h> +#include <time.h> /* NOLINT */ #if defined(_MSC_VER) #pragma warning(disable : 4996) /* deprecation */ @@ -122,7 +122,7 @@ int main(int ac, char* av[]) if (run_all == 1) { clock_t t; int status = 0; - const char* status_message = NULL; + const char* status_message = CM_NULL; printf("TAP version 13\n"); printf("1..%d\n", NumTests); for (i = 0; i < NumTests; ++i) { |