Fix merge

danmar · Mar 13, 2024 · 59584fa · 59584fa
1 parent 8ef9ea1
commit 59584fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -2207,13 +2207,13 @@ class TestStl : public TestFixture {
               "    auto it = std::find(v.begin(), v.end(), 0);\n"
               "    if (it != N::v.end()) {}\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
 
         check("void f(void* p) {\n" // #12445
               "    std::vector<int>&v = *(std::vector<int>*)(p);\n"
               "    v.erase(v.begin(), v.end());\n"
               "}\n");
-        ASSERT_EQUALS("", errout.str());
+        ASSERT_EQUALS("", errout_str());
     }
 
     void eraseIteratorOutOfBounds() {

diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -2910,7 +2910,7 @@ class TestUnusedVar : public TestFixture {
                               "    for (int i = 0; i < 10; )\n"
                               "        a[i++] = 0;\n"
                               "}");
-        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a[i++]' is assigned a value that is never used.\n", errout.str());
+        ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'a[i++]' is assigned a value that is never used.\n", errout_str());
     }
 
     void localvar10() {