cppcheck-opensource
diff --git a/Collapse file
‎lib/checkassert.cpp‎
Copy file name to clipboardExpand all lines: lib/checkassert.cpp
+3-3Lines changed: 3 additions & 3 deletions b/Collapse file
‎lib/checkassert.cpp‎
Copy file name to clipboardExpand all lines: lib/checkassert.cpp
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/Collapse file
‎lib/checkassert.h‎
Copy file name to clipboardExpand all lines: lib/checkassert.h
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎lib/checkassert.h‎
Copy file name to clipboardExpand all lines: lib/checkassert.h
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎test/testassert.cpp‎
Copy file name to clipboardExpand all lines: test/testassert.cpp
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎test/testassert.cpp‎
Copy file name to clipboardExpand all lines: test/testassert.cpp
+1-1Lines changed: 1 addition & 1 deletion
@@ -83,7 +83,7 @@ void CheckAssertImpl::assertWithSideEffects()
             if (!scope) {
                 // guess that const method doesn't have side effects
                 if (f->nestedIn->isClassOrStruct() && !f->isConst() && !f->isStatic())
-                    sideEffectInAssertError(tmp, f->name()); // Non-const member function called, assume it has side effects
+                    sideEffectInAssertError(tmp, f->name(), " If there are no side effects, consider declaring the method const."); // Non-const member function called, assume it has side effects
                 continue;
             }
 
@@ -117,12 +117,12 @@ void CheckAssertImpl::assertWithSideEffects()
 //---------------------------------------------------------------------------
 
 
-void CheckAssertImpl::sideEffectInAssertError(const Token *tok, const std::string& functionName)
+void CheckAssertImpl::sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra)
 {
     reportError(tok, Severity::warning,
                 "assertWithSideEffect",
                 "$symbol:" + functionName + "\n"
-                "Assert statement calls a function which may have desired side effects: '$symbol'.\n"
+                "Assert statement calls a function which may have desired side effects: '$symbol'." + extra + "\n"
                 "Non-pure function: '$symbol' is called inside assert statement. "
                 "Assert statements are removed from release builds so the code inside "
                 "assert statement is not executed. If the code is needed also in release "
 
@@ -65,7 +65,7 @@ class CPPCHECKLIB CheckAssertImpl : public CheckImpl {
     void checkVariableAssignment(const Token* assignTok, const Scope *assertionScope);
     static bool inSameScope(const Token* returnTok, const Token* assignTok);
 
-    void sideEffectInAssertError(const Token *tok, const std::string& functionName);
+    void sideEffectInAssertError(const Token *tok, const std::string& functionName, const std::string &extra = "");
     void assignmentInAssertError(const Token *tok, const std::string &varname);
 };
 /// @}
 
@@ -156,7 +156,7 @@ class TestAssert : public TestFixture {
               "void foo(SquarePack s) {\n"
               "   assert( s.Foo() );\n"
               "}");
-        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. [assertWithSideEffect]\n", errout_str());
+        ASSERT_EQUALS("[test.cpp:5:14]: (warning) Assert statement calls a function which may have desired side effects: 'Foo'. If there are no side effects, consider declaring the method const. [assertWithSideEffect]\n", errout_str());
 
         check("struct SquarePack {\n"
               "   int Foo() const;\n"