fixes

Author: ludviggunne

lib/checkclass.cpp

@@ -437,7 +437,7 @@ void CheckClass::copyconstructors()
                 }
             } else if (func.type == FunctionType::eDestructor && func.functionScope) {
                 // Deallocations in destructors
-                const Token* tok = func.token->linkAt(1);
+                const Token* tok = func.functionScope->bodyStart;
                 for (const Token* const end = func.functionScope->bodyEnd; tok != end; tok = tok->next()) {
                     if (Token::Match(tok, "delete %var%") ||
                         (Token::Match(tok, "%name% ( %var%") && mSettings->library.getDeallocFuncInfo(tok))) {
@@ -450,8 +450,8 @@ void CheckClass::copyconstructors()
             }
         }
 
-        bool hasAllocatedVars = !allocatedVars.empty();
-        bool hasDeallocatedVars = !deallocatedVars.empty();
+        const bool hasAllocatedVars = !allocatedVars.empty();
+        const bool hasDeallocatedVars = !deallocatedVars.empty();
 
         if (hasAllocatedVars || hasDeallocatedVars) {
             const Function *funcCopyCtor = nullptr;

lib/token.cpp

@@ -2632,8 +2632,6 @@ const ValueFlow::Value* Token::getContainerSizeValue(const MathLib::bigint val)
 
 TokenImpl::~TokenImpl()
 {
-    // cppcheck-suppress-begin [noCopyConstructor, noOperatorEq]
-
     delete mMacroName;
     delete mOriginalName;
     delete mValueType;
@@ -2651,8 +2649,6 @@ TokenImpl::~TokenImpl()
         mCppcheckAttributes = mCppcheckAttributes->next;
         delete c;
     }
-
-    // cppcheck-suppress-end [noCopyConstructor, noOperatorEq]
 }
 
 void TokenImpl::setCppcheckAttribute(TokenImpl::CppcheckAttributes::Type type, MathLib::bigint value)

lib/token.h

@@ -147,6 +147,9 @@ struct TokenImpl {
     TokenImpl() : mFunction(nullptr) {}
 
     ~TokenImpl();
+
+    TokenImpl(const TokenImpl &) = delete;
+    TokenImpl operator=(const TokenImpl &) = delete;
 };
 
 /// @addtogroup Core