change NOLINT->cppcheck-suppress

Signed-off-by: ISP akm <[email protected]>
tier4 · Jun 19, 2024 · 072e3dc · 072e3dc
1 parent 6bf5be1
commit 072e3dc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/cppcheck-differential.yaml b/.github/workflows/cppcheck-differential.yaml
@@ -48,7 +48,7 @@ jobs:
           files=$(cat changed_files.txt | grep -E '\.(cpp|hpp)$' || true)
           if [ -n "$files" ]; then
             echo "Running Cppcheck on changed files: $files"
-            cppcheck --enable=all --inconclusive --check-level=exhaustive --error-exitcode=1 --suppressions-list=.cppcheck_suppressions $files 2> cppcheck-report.txt
+            cppcheck --inline-suppr --enable=all --inconclusive --check-level=exhaustive --error-exitcode=1 --suppressions-list=.cppcheck_suppressions $files 2> cppcheck-report.txt
           else
             echo "No C++ files changed."
             touch cppcheck-report.txt

diff --git a/CARET_analyze_cpp_impl/src/iterator_base.cpp b/CARET_analyze_cpp_impl/src/iterator_base.cpp
@@ -34,10 +34,10 @@
 Record & IteratorBase::get_record() const
 {
   throw std::exception();
-  // NOLINTBEGIN(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-begin unreachableCode
   static Record record;
   return record;
-  // NOLINTEND(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-end unreachableCode
 }
 
 void IteratorBase::next()
@@ -48,18 +48,18 @@ void IteratorBase::next()
 bool IteratorBase::has_next() const
 {
   throw std::exception();
-  // NOLINTBEGIN(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-begin unreachableCode
   return false;
-  // NOLINTEND(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-end unreachableCode
 }
 
 const Record & ConstIteratorBase::get_record() const
 {
   throw std::exception();
-  // NOLINTBEGIN(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-begin unreachableCode
   static Record record;
   return record;
-  // NOLINTEND(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-end unreachableCode
 }
 
 void ConstIteratorBase::next()
@@ -70,7 +70,7 @@ void ConstIteratorBase::next()
 bool ConstIteratorBase::has_next() const
 {
   throw std::exception();
-  // NOLINTBEGIN(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-begin unreachableCode
   return false;
-  // NOLINTEND(cppcheck-suppress[unreachableCode])
+  // cppcheck-suppress-end unreachableCode
 }