From: Alexander Lanin <alex@lanin.de>
Date: Thu, 27 Aug 2020 05:11:56 +0000 (+0200)
Subject: Fix override usage (#640)
X-Git-Tag: v4.0~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b5c33b9de04b6ba79a27ba76f7ed12deb415bbb;p=thirdparty%2Fccache.git

Fix override usage (#640)
---

diff --git a/src/ResultDumper.hpp b/src/ResultDumper.hpp
index 767a83478..d5fa77097 100644
--- a/src/ResultDumper.hpp
+++ b/src/ResultDumper.hpp
@@ -28,13 +28,13 @@ class ResultDumper : public Result::Reader::Consumer
 public:
   ResultDumper(FILE* stream);
 
-  virtual void on_header(CacheEntryReader& cache_entry_reader);
-  virtual void on_entry_start(uint32_t entry_number,
+  void on_header(CacheEntryReader& cache_entry_reader) override;
+  void on_entry_start(uint32_t entry_number,
                               Result::FileType file_type,
                               uint64_t file_len,
-                              nonstd::optional<std::string> raw_file);
-  virtual void on_entry_data(const uint8_t* data, size_t size);
-  virtual void on_entry_end();
+                              nonstd::optional<std::string> raw_file) override;
+  void on_entry_data(const uint8_t* data, size_t size) override;
+  void on_entry_end() override;
 
 private:
   FILE* m_stream;
diff --git a/src/ResultExtractor.hpp b/src/ResultExtractor.hpp
index 14b6871ea..c47474762 100644
--- a/src/ResultExtractor.hpp
+++ b/src/ResultExtractor.hpp
@@ -31,13 +31,13 @@ class ResultExtractor : public Result::Reader::Consumer
 public:
   ResultExtractor(const std::string& directory);
 
-  virtual void on_header(CacheEntryReader& cache_entry_reader);
-  virtual void on_entry_start(uint32_t entry_number,
+  void on_header(CacheEntryReader& cache_entry_reader) override;
+  void on_entry_start(uint32_t entry_number,
                               Result::FileType file_type,
                               uint64_t file_len,
-                              nonstd::optional<std::string> raw_file);
-  virtual void on_entry_data(const uint8_t* data, size_t size);
-  virtual void on_entry_end();
+                              nonstd::optional<std::string> raw_file) override;
+  void on_entry_data(const uint8_t* data, size_t size) override;
+  void on_entry_end() override;
 
 private:
   const std::string m_directory;
diff --git a/src/ResultRetriever.hpp b/src/ResultRetriever.hpp
index 4db8ec613..b3ac48896 100644
--- a/src/ResultRetriever.hpp
+++ b/src/ResultRetriever.hpp
@@ -31,13 +31,13 @@ class ResultRetriever : public Result::Reader::Consumer
 public:
   ResultRetriever(Context& ctx, bool rewrite_dependency_target);
 
-  virtual void on_header(CacheEntryReader& cache_entry_reader);
-  virtual void on_entry_start(uint32_t entry_number,
+  void on_header(CacheEntryReader& cache_entry_reader) override;
+  void on_entry_start(uint32_t entry_number,
                               Result::FileType file_type,
                               uint64_t file_len,
-                              nonstd::optional<std::string> raw_file);
-  virtual void on_entry_data(const uint8_t* data, size_t size);
-  virtual void on_entry_end();
+                              nonstd::optional<std::string> raw_file) override;
+  void on_entry_data(const uint8_t* data, size_t size) override;
+  void on_entry_end() override;
 
 private:
   Context& m_ctx;
diff --git a/src/third_party/fmt/core.h b/src/third_party/fmt/core.h
index 37799a3a0..031bf869e 100644
--- a/src/third_party/fmt/core.h
+++ b/src/third_party/fmt/core.h
@@ -99,7 +99,7 @@
 #endif
 
 #ifndef FMT_OVERRIDE
-#  if FMT_HAS_FEATURE(cxx_override) || \
+#  if FMT_HAS_FEATURE(cxx_override_control) || \
       (FMT_GCC_VERSION >= 408 && FMT_HAS_GXX_CXX11) || FMT_MSC_VER >= 1900
 #    define FMT_OVERRIDE override
 #  else