From ca2a84c3d731a5e1210ebe52a1d203478a2cadeb Mon Sep 17 00:00:00 2001 From: Sylvain Joubert Date: Tue, 25 Apr 2023 11:29:28 +0200 Subject: TestDriver: Fix 'misc-use-anonymous-namespace' warning from clang-tidy 16 C++ best practices recommend using anonymous namespace instead of a global static qualifier. --- Templates/TestDriver.cxx.in | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Templates') diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in index c47266a75e..3bb2fd6b39 100644 --- a/Templates/TestDriver.cxx.in +++ b/Templates/TestDriver.cxx.in @@ -20,11 +20,19 @@ # else # define CM_NULL NULL # endif +# define CM_NAMESPACE_BEGIN namespace { +# define CM_NAMESPACE_END } +# define CM_LOCAL #else # define CM_CAST(TYPE, EXPR) (TYPE)(EXPR) # define CM_NULL NULL +# define CM_NAMESPACE_BEGIN +# define CM_NAMESPACE_END +# define CM_LOCAL static #endif +CM_NAMESPACE_BEGIN + /* Create map. */ typedef int (*MainFuncPointer)(int, char* []); /* NOLINT */ @@ -34,17 +42,17 @@ typedef struct /* NOLINT */ MainFuncPointer func; } functionMapEntry; -static functionMapEntry cmakeGeneratedFunctionMapEntries[] = { +CM_LOCAL const functionMapEntry cmakeGeneratedFunctionMapEntries[] = { @CMAKE_FUNCTION_TABLE_ENTRIES@ { CM_NULL, CM_NULL } /* NOLINT */ }; -static const int NumTests = CM_CAST(int, +CM_LOCAL 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) */ -static char* lowercase(const char* string) +CM_LOCAL char* lowercase(const char* string) { char *new_string; char *p; @@ -63,7 +71,7 @@ static char* lowercase(const char* string) return new_string; } -static int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) { +CM_LOCAL int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) { int i; for (i = 0; i < n_skipped_tests; i++) { if (strcmp(name, skipped_tests[i]) == 0) { @@ -74,6 +82,8 @@ static int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_te return 0; } +CM_NAMESPACE_END + int main(int ac, char* av[]) { int i; -- cgit v1.2.1