Refactoring: Use NOEXCEPT for swap methods (danmar#6682)

danmar · web-flow · commit 11df5ae6f3a8 · 2024-08-11T20:40:13.000+02:00
Misra C++ 2023 rule 18.4.1: Exception-unfriendly functions shall be
noexcept
diff --git a/cppcheckpremium-suppressions b/cppcheckpremium-suppressions
@@ -223,9 +223,6 @@ premium-misra-cpp-2023-18.1.1
 # TODO do not throw token pointer?
 premium-misra-cpp-2023-18.3.2:lib/tokenize.cpp
 
-# TODO use noexcept
-premium-misra-cpp-2023-18.4.1
-
 # in smallvector we intentionally put a constant above some preprocessor includes
 premium-misra-cpp-2023-19.0.3:lib/smallvector.h
 
diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
@@ -76,7 +76,7 @@ class CPPCHECKLIB VarInfo {
         referenced.erase(varid);
     }
 
-    void swap(VarInfo &other) {
+    void swap(VarInfo &other) NOEXCEPT {
         alloctype.swap(other.alloctype);
         possibleUsage.swap(other.possibleUsage);
         conditionalAlloc.swap(other.conditionalAlloc);
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -184,7 +184,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred
     }
 }
 
-void ProgramMemory::swap(ProgramMemory &pm)
+void ProgramMemory::swap(ProgramMemory &pm) NOEXCEPT
 {
     mValues.swap(pm.mValues);
 }
diff --git a/lib/programmemory.h b/lib/programmemory.h
@@ -124,7 +124,7 @@ struct CPPCHECKLIB ProgramMemory {
 
     void erase_if(const std::function<bool(const ExprIdToken&)>& pred);
 
-    void swap(ProgramMemory &pm);
+    void swap(ProgramMemory &pm) NOEXCEPT;
 
     void clear();
 
diff --git a/lib/valueptr.h b/lib/valueptr.h
@@ -75,7 +75,7 @@ class CPPCHECKLIB ValuePtr {
         return get();
     }
 
-    void swap(ValuePtr& rhs) {
+    void swap(ValuePtr& rhs) NOEXCEPT {
         using std::swap;
         swap(mPtr, rhs.mPtr);
         swap(mClone, rhs.mClone);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class CPPCHECKLIB VarInfo {`
`76`	`76`	`referenced.erase(varid);`
`77`	`77`	`}`
`78`	`78`
`79`		`- void swap(VarInfo &other) {`
	`79`	`+ void swap(VarInfo &other) NOEXCEPT {`
`80`	`80`	`alloctype.swap(other.alloctype);`
`81`	`81`	`possibleUsage.swap(other.possibleUsage);`
`82`	`82`	`conditionalAlloc.swap(other.conditionalAlloc);`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ void ProgramMemory::erase_if(const std::function<bool(const ExprIdToken&)>& pred`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
`187`		`-void ProgramMemory::swap(ProgramMemory &pm)`
	`187`	`+void ProgramMemory::swap(ProgramMemory &pm) NOEXCEPT`
`188`	`188`	`{`
`189`	`189`	`mValues.swap(pm.mValues);`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class CPPCHECKLIB ValuePtr {`
`75`	`75`	`return get();`
`76`	`76`	`}`
`77`	`77`
`78`		`- void swap(ValuePtr& rhs) {`
	`78`	`+ void swap(ValuePtr& rhs) NOEXCEPT {`
`79`	`79`	`using std::swap;`
`80`	`80`	`swap(mPtr, rhs.mPtr);`
`81`	`81`	`swap(mClone, rhs.mClone);`