From 883e1a9efe1b07104c226b7070d40a320ae04309 Mon Sep 17 00:00:00 2001 From: firewave Date: Sun, 7 Aug 2022 18:34:24 +0200 Subject: [PATCH] avoid some `const_cast` usage --- lib/symboldatabase.h | 4 ++-- lib/token.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h index 00868694933..d1fe2ea8c18 100644 --- a/lib/symboldatabase.h +++ b/lib/symboldatabase.h @@ -1356,12 +1356,12 @@ class CPPCHECKLIB SymbolDatabase { const Type* findType(const Token* startTok, const Scope* startScope, bool lookOutside = false) const; Type* findType(const Token* startTok, Scope* startScope, bool lookOutside = false) { - return const_cast(this->findType(startTok, const_cast(startScope), lookOutside)); + return const_cast(this->findType(startTok, static_cast(startScope), lookOutside)); } const Scope *findScope(const Token *tok, const Scope *startScope) const; Scope *findScope(const Token *tok, Scope *startScope) { - return const_cast(this->findScope(tok, const_cast(startScope))); + return const_cast(this->findScope(tok, static_cast(startScope))); } // cppcheck-suppress unusedFunction diff --git a/lib/token.cpp b/lib/token.cpp index 5af8884cdef..6a492e04275 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -900,7 +900,7 @@ const Token * Token::findClosingBracket() const Token * Token::findClosingBracket() { // return value of const function - return const_cast(const_cast(this)->findClosingBracket()); + return const_cast(static_cast(this)->findClosingBracket()); } const Token * Token::findOpeningBracket() const @@ -932,7 +932,7 @@ const Token * Token::findOpeningBracket() const Token * Token::findOpeningBracket() { // return value of const function - return const_cast(const_cast(this)->findOpeningBracket()); + return const_cast(static_cast(this)->findOpeningBracket()); } //---------------------------------------------------------------------------