Fixed danmar#7349 (checker 'inefficient find()' unintentionally used for find_first_of())

danmar · danmar · commit fa31ebf88e8b · 2016-01-29T08:55:46.000+01:00
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -700,7 +700,7 @@ void CheckStl::if_find()
 
                 if (printWarning && container->getYield(funcTok->str()) == Library::Container::ITERATOR)
                     if_findError(tok, false);
-                else if (printPerformance && container->stdStringLike)
+                else if (printPerformance && container->stdStringLike && funcTok->str() == "find")
                     if_findError(tok, true);
             } else if (printWarning && Token::Match(tok, "std :: find|find_if (")) {
                 // check that result is checked properly
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -1726,6 +1726,12 @@ class TestStl : public TestFixture {
               "    if (foo(s.find(\"abc\"))) { }\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #7349 - std::string::find_first_of
+        check("void f(const std::string &s) {\n"
+              "    if (s.find_first_of(\"abc\")==0) { }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
 
