From e2c84b896fad37cbbf40c02f24c058b641e5bccc Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 16 May 2025 12:39:59 +0100
Subject: [PATCH] Squashed 'src/leveldb/' changes from 4188247086..113db4962b

113db4962b Merge bitcoin-core/leveldb-subtree#51: refactor: add missing overrides
9defe8494a refactor: add missing overrides

git-subtree-dir: src/leveldb
git-subtree-split: 113db4962b8be416c17ad2b4bdcc5514c51d7181
---
 db/c.cc             |  6 +++---
 db/db_test.cc       | 16 ++++++++--------
 db/log_test.cc      |  2 +-
 table/table_test.cc |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/db/c.cc b/db/c.cc
index 3a492f9ac5..8def427551 100644
--- a/db/c.cc
+++ b/db/c.cc
@@ -471,11 +471,11 @@ leveldb_filterpolicy_t* leveldb_filterpolicy_create_bloom(int bits_per_key) {
     static void DoNothing(void*) {}
 
     ~Wrapper() { delete rep_; }
-    const char* Name() const { return rep_->Name(); }
-    void CreateFilter(const Slice* keys, int n, std::string* dst) const {
+    const char* Name() const override { return rep_->Name(); }
+    void CreateFilter(const Slice* keys, int n, std::string* dst) const override {
       return rep_->CreateFilter(keys, n, dst);
     }
-    bool KeyMayMatch(const Slice& key, const Slice& filter) const {
+    bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
       return rep_->KeyMayMatch(key, filter);
     }
 
diff --git a/db/db_test.cc b/db/db_test.cc
index beb1d3bdef..5ed9c1d75e 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -139,7 +139,7 @@ class SpecialEnv : public EnvWrapper {
      public:
       DataFile(SpecialEnv* env, WritableFile* base) : env_(env), base_(base) {}
       ~DataFile() { delete base_; }
-      Status Append(const Slice& data) {
+      Status Append(const Slice& data) override {
         if (env_->no_space_.load(std::memory_order_acquire)) {
           // Drop writes on the floor
           return Status::OK();
@@ -147,9 +147,9 @@ class SpecialEnv : public EnvWrapper {
           return base_->Append(data);
         }
       }
-      Status Close() { return base_->Close(); }
-      Status Flush() { return base_->Flush(); }
-      Status Sync() {
+      Status Close() override { return base_->Close(); }
+      Status Flush() override { return base_->Flush(); }
+      Status Sync() override {
         if (env_->data_sync_error_.load(std::memory_order_acquire)) {
           return Status::IOError("simulated data sync error");
         }
@@ -168,16 +168,16 @@ class SpecialEnv : public EnvWrapper {
      public:
       ManifestFile(SpecialEnv* env, WritableFile* b) : env_(env), base_(b) {}
       ~ManifestFile() { delete base_; }
-      Status Append(const Slice& data) {
+      Status Append(const Slice& data) override {
         if (env_->manifest_write_error_.load(std::memory_order_acquire)) {
           return Status::IOError("simulated writer error");
         } else {
           return base_->Append(data);
         }
       }
-      Status Close() { return base_->Close(); }
-      Status Flush() { return base_->Flush(); }
-      Status Sync() {
+      Status Close() override { return base_->Close(); }
+      Status Flush() override { return base_->Flush(); }
+      Status Sync() override {
         if (env_->manifest_sync_error_.load(std::memory_order_acquire)) {
           return Status::IOError("simulated sync error");
         } else {
diff --git a/db/log_test.cc b/db/log_test.cc
index 41fc043068..45b6bb1970 100644
--- a/db/log_test.cc
+++ b/db/log_test.cc
@@ -205,7 +205,7 @@ class LogTest {
 
       return Status::OK();
     }
-    std::string GetName() const { return ""; }
+    std::string GetName() const override { return ""; }
 
     Slice contents_;
     bool force_error_;
diff --git a/table/table_test.cc b/table/table_test.cc
index 17aaea2f9e..3156c0a6b0 100644
--- a/table/table_test.cc
+++ b/table/table_test.cc
@@ -129,7 +129,7 @@ class StringSource : public RandomAccessFile {
     return Status::OK();
   }
 
-  std::string GetName() const { return ""; }
+  std::string GetName() const override { return ""; }
  private:
   std::string contents_;
 };