walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Tokenizer: Do not remove 'constexpr'" 

This reverts commit 2f400b40ba.
This commit is contained in:
Daniel Marjamäki 2018-11-02 21:07:24 +01:00
parent 2f400b40ba
commit 0cc4555337
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -9102,8 +9102,8 @@ void Tokenizer::simplifyKeyword()
} }
if (isCPP() && mSettings->standards.cpp >= Standards::CPP11) { if (isCPP() && mSettings->standards.cpp >= Standards::CPP11) {
if (tok->str() == "constexpr") { while (tok->str() == "constexpr") {
tok->str("const"); tok->deleteThis();
} }
// final: // final:

2
test/testsimplifytokens.cpp
View File

@ -3272,7 +3272,7 @@ private:
ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }", true)); ASSERT_EQUALS("int foo ( ) { }", tok("inline int foo ( ) { }", true));
ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }", true)); ASSERT_EQUALS("int foo ( ) { }", tok("__inline int foo ( ) { }", true));
ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }", true)); ASSERT_EQUALS("int foo ( ) { }", tok("__forceinline int foo ( ) { }", true));
ASSERT_EQUALS("", tok("constexpr int x = 3;", true)); ASSERT_EQUALS("int foo ( ) { }", tok("constexpr int foo() { }", true));
ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }", true)); ASSERT_EQUALS("void f ( ) { int final [ 10 ] ; }", tok("void f() { int final[10]; }", true));
ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", "test.c")); ASSERT_EQUALS("int * p ;", tok("int * __restrict p;", "test.c"));
ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", "test.c")); ASSERT_EQUALS("int * * p ;", tok("int * __restrict__ * p;", "test.c"));