Merge pull request #315 from ROCmSoftwarePlatform/roblemos/cppcheck

Modifications for cppcheck
ROCm · Jul 28, 2023 · 71f7a9a · 71f7a9a
2 parents e646b41 + 7a051b4
commit 71f7a9a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/test/test_utils.hpp b/test/test_utils.hpp
@@ -601,7 +601,7 @@ void test_future_value_retrieval(Future&& f, decltype(f.extract()) &return_value
   auto const r2 = f.extract();
 
   ASSERT_THROW(
-    auto x = f.extract();
+    auto x = f.extract();  // cppcheck-suppress unknownMacro
     THRUST_UNUSED_VAR(x)
     , thrust::event_error
   );

diff --git a/thrust/detail/preprocessor.h b/thrust/detail/preprocessor.h
@@ -78,7 +78,7 @@
   #define THRUST_PP_CAT2_IMPL0(a, b) THRUST_PP_CAT2_IMPL1(~, a ## b)
   #define THRUST_PP_CAT2_IMPL1(p, res) res
 #else
-  #define THRUST_PP_CAT2_IMPL0(a, b) a ## b
+  #define THRUST_PP_CAT2_IMPL0(a, b) a ## b  // cppcheck-suppress preprocessorErrorDirective
 #endif
 
 #define THRUST_PP_CAT3(a, b, c)                                               \

diff --git a/thrust/system/cuda/config.h b/thrust/system/cuda/config.h
@@ -80,7 +80,8 @@
 #endif
 
 // Make sure the CUB namespace has been declared using the modern macros:
-CUB_NAMESPACE_BEGIN
+
+CUB_NAMESPACE_BEGIN // cppcheck-suppress unknownMacro
 CUB_NAMESPACE_END
 
 #else // THRUST_IGNORE_CUB_VERSION_CHECK