Преглед на файлове

Merge topic 'TestDriver-time.h-lint'

0bb3d457cb TestDriver: use `CM_NULL` to avoid lints about `nullptr` usage
32ff836e2a TestDriver: suppress deprecated header lints for time.h

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6352
Brad King преди 4 години
родител
ревизия
d86debe20a
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      Templates/TestDriver.cxx.in

+ 2 - 2
Templates/TestDriver.cxx.in

@@ -2,7 +2,7 @@
 #include <stdio.h>  /* NOLINT */
 #include <stdio.h>  /* NOLINT */
 #include <stdlib.h> /* NOLINT */
 #include <stdlib.h> /* NOLINT */
 #include <string.h> /* NOLINT */
 #include <string.h> /* NOLINT */
-#include <time.h>
+#include <time.h>   /* NOLINT */
 
 
 #if defined(_MSC_VER)
 #if defined(_MSC_VER)
 #pragma warning(disable : 4996) /* deprecation */
 #pragma warning(disable : 4996) /* deprecation */
@@ -122,7 +122,7 @@ int main(int ac, char* av[])
   if (run_all == 1) {
   if (run_all == 1) {
     clock_t t;
     clock_t t;
     int status = 0;
     int status = 0;
-    const char* status_message = NULL;
+    const char* status_message = CM_NULL;
     printf("TAP version 13\n");
     printf("TAP version 13\n");
     printf("1..%d\n", NumTests);
     printf("1..%d\n", NumTests);
     for (i = 0; i < NumTests; ++i) {
     for (i = 0; i < NumTests; ++i) {