From b3582baa3a2f84db7d2fb5a681121a5f2d6de3a1 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Thu, 6 Jul 2023 18:35:13 +0000 Subject: [PATCH] wallet: bdb: move SafeDbt to cpp file Dbt requires including bdb headers. --- src/wallet/bdb.cpp | 20 ++++++++++++++++++++ src/wallet/bdb.h | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp index 4d410fa39e5..26938e0a7d5 100644 --- a/src/wallet/bdb.cpp +++ b/src/wallet/bdb.cpp @@ -232,6 +232,26 @@ BerkeleyEnvironment::BerkeleyEnvironment() : m_use_shared_memory(false) fMockDb = true; } +/** RAII class that automatically cleanses its data on destruction */ +class SafeDbt final +{ + Dbt m_dbt; + +public: + // construct Dbt with internally-managed data + SafeDbt(); + // construct Dbt with provided data + SafeDbt(void* data, size_t size); + ~SafeDbt(); + + // delegate to Dbt + const void* get_data() const; + uint32_t get_size() const; + + // conversion operator to access the underlying Dbt + operator Dbt*(); +}; + SafeDbt::SafeDbt() { m_dbt.set_flags(DB_DBT_MALLOC); diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h index 9552d8ce252..da32195dc62 100644 --- a/src/wallet/bdb.h +++ b/src/wallet/bdb.h @@ -152,26 +152,6 @@ public: std::unique_ptr MakeBatch(bool flush_on_close = true) override; }; -/** RAII class that automatically cleanses its data on destruction */ -class SafeDbt final -{ - Dbt m_dbt; - -public: - // construct Dbt with internally-managed data - SafeDbt(); - // construct Dbt with provided data - SafeDbt(void* data, size_t size); - ~SafeDbt(); - - // delegate to Dbt - const void* get_data() const; - uint32_t get_size() const; - - // conversion operator to access the underlying Dbt - operator Dbt*(); -}; - class BerkeleyCursor : public DatabaseCursor { private: