From 13ed2effa1280e21b4dfede044e0eef508f38d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 22 Dec 2020 08:09:26 +0100 Subject: [PATCH] astyle formatting [ci skip] --- lib/checkclass.cpp | 6 +++--- test/testclass.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index a6b5f0371..dd477fbf0 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -2454,9 +2454,9 @@ void CheckClass::checkDuplInheritedMembersRecursive(const Type* typeCurrent, con for (const Variable &parentClassVarIt : parentClassIt.type->classScope->varlist) { if (classVarIt.name() == parentClassVarIt.name() && !parentClassVarIt.isPrivate()) { // Check if the class and its parent have a common variable duplInheritedMembersError(classVarIt.nameToken(), parentClassVarIt.nameToken(), - typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(), - typeCurrent->classScope->type == Scope::eStruct, - parentClassIt.type->classScope->type == Scope::eStruct); + typeCurrent->name(), parentClassIt.type->name(), classVarIt.name(), + typeCurrent->classScope->type == Scope::eStruct, + parentClassIt.type->classScope->type == Scope::eStruct); } } } diff --git a/test/testclass.cpp b/test/testclass.cpp index 1cfbf055b..16f45009e 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -567,9 +567,9 @@ private: " int j;\n" "};\n" "class Derived2 : public Derived1 {\n" - " int i;\n" + " int i;\n" "};"); - ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'.\n", errout.str()); + ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:10]: (warning) The class 'Derived2' defines member variable with name 'i' also defined in its parent class 'Base'.\n", errout.str()); }