ci fixes

Author: ludviggunne

lib/errorlogger.h

@@ -326,9 +326,9 @@ class CPPCHECKLIB ErrorLogger {
 protected:
     virtual std::size_t getSourceCacheSize() const {
         return 4;
-    };
+    }
 
-    class SourceCacheEntry {
+    class CPPCHECKLIB SourceCacheEntry {
     public:
         explicit SourceCacheEntry(const std::string &file, int prio);
 
@@ -342,7 +342,7 @@ class CPPCHECKLIB ErrorLogger {
     private:
         std::ifstream mStream;
         std::string mLine;
-        int mLinenr;
+        int mLinenr{0};
     };
 
     std::vector<std::shared_ptr<SourceCacheEntry>> mSourceCache;

test/testerrorlogger.cpp

@@ -872,18 +872,18 @@ class TestErrorLogger : public TestFixture {
     public:
         friend class TestErrorLogger;
 
-        virtual void reportOut(const std::string &outmsg, Color c)
+        void reportOut(const std::string &outmsg, Color c) override
         {
             (void) outmsg;
             (void) c;
         }
 
-        virtual void reportErr(const ErrorMessage &msg)
+        void reportErr(const ErrorMessage &msg) override
         {
             (void) msg.toString(false, "{code}", "{code}", getSourceLineCallback());
         }
 
-        virtual void reportMetric(const std::string &metric)
+        void reportMetric(const std::string &metric) override
         {
             (void) metric;
         }
@@ -910,8 +910,8 @@ class TestErrorLogger : public TestFixture {
     void testCacheContent_(const char *testfile,
                            int testline,
                            const std::string &file,
-                           std::vector<std::string> &&callstackFiles,
-                           std::vector<TestSourceCacheLogger::Match> &&content)
+                           const std::vector<std::string> &callstackFiles,
+                           const std::vector<TestSourceCacheLogger::Match> &content)
     {
         const auto heapCompare = [](const std::shared_ptr<ErrorLogger::SourceCacheEntry> &lhs,
                                     const std::shared_ptr<ErrorLogger::SourceCacheEntry> &rhs)
@@ -920,8 +920,8 @@ class TestErrorLogger : public TestFixture {
         };
 
         std::list<ErrorMessage::FileLocation> callstack;
-        for (const auto &file : callstackFiles)
-            callstack.emplace_back(file, 1, 1);
+        for (const auto &filename : callstackFiles)
+            callstack.emplace_back(filename, 1, 1);
 
         const ErrorMessage msg(callstack,
                                file,
@@ -935,10 +935,10 @@ class TestErrorLogger : public TestFixture {
         ASSERT_EQUALS(content.size(), copy.size());
 
         std::make_heap(copy.begin(), copy.end(), heapCompare);
-        for (const auto match : content) {
+        for (const auto &match : content) {
             std::pop_heap(copy.begin(), copy.end(), heapCompare);
-            ASSERT_EQUALS(match.file, copy.back()->file);
-            ASSERT_EQUALS(match.prio, copy.back()->prio);
+            ASSERT_EQUALS_LOC(match.file, copy.back()->file, testfile, testline);
+            ASSERT_EQUALS_LOC(match.prio, copy.back()->prio, testfile, testline);
             copy.pop_back();
         }
     }