Fix override usage (#640)

diff --git a/src/ResultDumper.hpp b/src/ResultDumper.hpp
index 767a834783d135379f906b0a8241d5ba737fac75..d5fa770976311c1278daf52d038575d3a726ad45 100644 (file)
--- 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 14b6871ea445d39af52fcb0e5938005df8b7f43b..c474747624a7010b37f5a4260b5cf3ff99f351f7 100644 (file)
--- 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 4db8ec613a3a621dddb53e260adf7dbc1354024b..b3ac48896bc75d6e6f47b9f595366df926f5f0a1 100644 (file)
--- 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 37799a3a0c488b676f14e2301996e2d6b41a1e1e..031bf869e13798523d6928810d4450434c742d61 100644 (file)
--- 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