Rename C++ header files to .hpp

[lttng-tools.git] / tests / utils / testapp / gen-ns-events / gen-ns-events.cpp

diff --git a/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp b/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp
index 78b962d19bb71a0e214fcd6a0f4ec41511eb73f1..80afdb6d63ed27c99510c7068436a7539d23bcf2 100644 (file)
--- a/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp
+++ b/tests/utils/testapp/gen-ns-events/gen-ns-events.cpp
@@ -18,11 +18,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <inttypes.h>
 
-#include <common/compat/tid.h>
-#include <common/macros.h>
+#include <common/compat/tid.hpp>
+#include <common/macros.hpp>
 
-#include "signal-helper.h"
+#include "signal-helper.hpp"
 #include "utils.h"
 
 #define LTTNG_PROC_NS_PATH_MAX 40
@@ -72,7 +73,7 @@ static struct poptOption opts[] = {
        { "after", 'a', POPT_ARG_STRING, &after_unshare_wait_file_path, 0, "Wait for file after unshare", NULL },
        { "signal", 's', POPT_ARG_STRING, &after_unshare_signal_file_path, 0, "Create signal file after unshare", NULL },
        POPT_AUTOHELP
-       { NULL, 0, 0, NULL, 0 }
+       { NULL, 0, 0, NULL, 0, NULL, NULL }
 };
 
 static ATTR_FORMAT_PRINTF(1, 2)
@@ -132,7 +133,7 @@ static int do_the_needful(int ns_flag, const char *ns_str)
                ret = -1;
                goto end;
        }
-       debug_printf("Initial %s ns inode number:      %lu\n", ns_str, ns1);
+       debug_printf("Initial %s ns inode number:      %" PRIuMAX "\n", ns_str, (uintmax_t) ns1);
 
        /* Wait on synchronization before unshare. */
        if (before_unshare_wait_file_path) {
@@ -155,7 +156,7 @@ static int do_the_needful(int ns_flag, const char *ns_str)
                ret = -1;
                goto end;
        }
-       debug_printf("Post unshare %s ns inode number: %lu\n", ns_str, ns2);
+       debug_printf("Post unshare %s ns inode number: %" PRIuMAX "\n", ns_str, (uintmax_t) ns2);
 
        /* Signal that the unshare call is completed. */
        if (after_unshare_signal_file_path) {