Skip to content

Commit 5be8d9d

Browse files
authored
avoid some const_cast usage (#4344)
1 parent 9d9cf75 commit 5be8d9d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

lib/symboldatabase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,12 +1356,12 @@ class CPPCHECKLIB SymbolDatabase {
13561356
const Type* findType(const Token* startTok, const Scope* startScope, bool lookOutside = false) const;
13571357
Type* findType(const Token* startTok, Scope* startScope, bool lookOutside = false)
13581358
{
1359-
return const_cast<Type*>(this->findType(startTok, const_cast<const Scope*>(startScope), lookOutside));
1359+
return const_cast<Type*>(this->findType(startTok, static_cast<const Scope*>(startScope), lookOutside));
13601360
}
13611361

13621362
const Scope *findScope(const Token *tok, const Scope *startScope) const;
13631363
Scope *findScope(const Token *tok, Scope *startScope) {
1364-
return const_cast<Scope *>(this->findScope(tok, const_cast<const Scope *>(startScope)));
1364+
return const_cast<Scope *>(this->findScope(tok, static_cast<const Scope *>(startScope)));
13651365
}
13661366

13671367
// cppcheck-suppress unusedFunction

lib/token.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ const Token * Token::findClosingBracket() const
900900
Token * Token::findClosingBracket()
901901
{
902902
// return value of const function
903-
return const_cast<Token*>(const_cast<const Token*>(this)->findClosingBracket());
903+
return const_cast<Token*>(static_cast<const Token*>(this)->findClosingBracket());
904904
}
905905

906906
const Token * Token::findOpeningBracket() const
@@ -932,7 +932,7 @@ const Token * Token::findOpeningBracket() const
932932
Token * Token::findOpeningBracket()
933933
{
934934
// return value of const function
935-
return const_cast<Token*>(const_cast<const Token*>(this)->findOpeningBracket());
935+
return const_cast<Token*>(static_cast<const Token*>(this)->findOpeningBracket());
936936
}
937937

938938
//---------------------------------------------------------------------------

0 commit comments

Comments
 (0)