From c2fc4973ad89e432517b3d2edd49b8c541f26464 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 17 Jan 2022 20:51:23 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20#10515=20False=20positive=20for=20explici?= =?UTF-8?q?t=20one-argument=20constructor=20if=20co=E2=80=A6=20(#3718)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/symboldatabase.cpp | 2 +- test/testclass.cpp | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp index e420564a0..ca6899066 100644 --- a/lib/symboldatabase.cpp +++ b/lib/symboldatabase.cpp @@ -2208,7 +2208,7 @@ Function::Function(const Tokenizer *mTokenizer, else type = Function::eConstructor; - isExplicit(tokenDef->previous()->str() == "explicit"); + isExplicit(tokenDef->strAt(-1) == "explicit" || tokenDef->strAt(-2) == "explicit"); } const Token *tok1 = setFlags(tok, scope); diff --git a/test/testclass.cpp b/test/testclass.cpp index a219c7cac..d4b37eaf9 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -444,6 +444,19 @@ private: " A(int, int y=2) {}" "};"); ASSERT_EQUALS("[test.cpp:1]: (style) Struct 'A' has a constructor with 1 argument that is not explicit.\n", errout.str()); + + checkExplicitConstructors("struct Foo {\n" + " template \n" + " explicit constexpr Foo(T) {}\n" + "};\n" + "struct Bar {\n" + " template \n" + " constexpr explicit Bar(T) {}\n" + "};\n" + "struct Baz {\n" + " explicit constexpr Baz(int) {}\n" + "};\n"); + ASSERT_EQUALS("", errout.str()); } #define checkDuplInheritedMembers(code) checkDuplInheritedMembers_(code, __FILE__, __LINE__)