From ae576be088b65ce286699eec9ddca0f2807b6ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 1 May 2010 21:43:47 +0200 Subject: [PATCH] refactoring: enable the 'suspicious pointer subtraction' checking --- lib/checkclass.cpp | 4 ++-- test/testclass.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 669d63395..1acef8bbc 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -1474,12 +1474,12 @@ void CheckClass::virtualDestructor() void CheckClass::thisSubtractionError(const Token *tok) { - reportError(tok, Severity::possibleStyle, "thisSubtraction", "Suspicious pointer subtraction"); + reportError(tok, Severity::style, "thisSubtraction", "Suspicious pointer subtraction"); } void CheckClass::thisSubtraction() { - if (!_settings->_checkCodingStyle || !_settings->inconclusive) + if (!_settings->_checkCodingStyle) return; const Token *tok = _tokenizer->tokens(); diff --git a/test/testclass.cpp b/test/testclass.cpp index db7cfb717..53eec6b55 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -2123,20 +2123,20 @@ private: void this_subtraction() { checkThisSubtraction("; this-x ;"); - ASSERT_EQUALS("[test.cpp:1]: (possible style) Suspicious pointer subtraction\n", errout.str()); + ASSERT_EQUALS("[test.cpp:1]: (style) Suspicious pointer subtraction\n", errout.str()); checkThisSubtraction("; *this = *this-x ;"); ASSERT_EQUALS("", errout.str()); checkThisSubtraction("; *this = *this-x ;\n" "this-x ;"); - ASSERT_EQUALS("[test.cpp:2]: (possible style) Suspicious pointer subtraction\n", errout.str()); + ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious pointer subtraction\n", errout.str()); checkThisSubtraction("; *this = *this-x ;\n" "this-x ;\n" "this-x ;\n"); - ASSERT_EQUALS("[test.cpp:2]: (possible style) Suspicious pointer subtraction\n" - "[test.cpp:3]: (possible style) Suspicious pointer subtraction\n", errout.str()); + ASSERT_EQUALS("[test.cpp:2]: (style) Suspicious pointer subtraction\n" + "[test.cpp:3]: (style) Suspicious pointer subtraction\n", errout.str()); } void checkConst(const char code[])