From 74507ce71eb61105fb3ae8460999099234ca7b8b Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Mon, 15 Jun 2020 16:14:57 -0400 Subject: [PATCH] walletdb: Remove BerkeleyBatch friend class from BerkeleyDatabase --- src/wallet/bdb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h index 90f5f2e877..982423f00e 100644 --- a/src/wallet/bdb.h +++ b/src/wallet/bdb.h @@ -97,7 +97,6 @@ class BerkeleyBatch; **/ class BerkeleyDatabase : public WalletDatabase { - friend class BerkeleyBatch; public: /** Create dummy DB handle */ BerkeleyDatabase() : WalletDatabase(), env(nullptr) @@ -163,11 +162,12 @@ public: /** Database pointer. This is initialized lazily and reset during flushes, so it can be null. */ std::unique_ptr m_db; + std::string strFile; + /** Make a BerkeleyBatch connected to this database */ std::unique_ptr MakeBatch(const char* mode = "r+", bool flush_on_close = true) override; private: - std::string strFile; /** Return whether this database handle is a dummy for testing. * Only to be used at a low level, application should ideally not care