From 7c785d0d7c974c7fa5880f2206689929cd98d856 Mon Sep 17 00:00:00 2001 From: Joe Loser Date: Sun, 13 May 2018 10:55:45 -0400 Subject: [PATCH] Add missing override keyword: * Enable the `suggest-override` warning for gcc * Fix all functions that were flagged by that warning --- Builds/CMake/CMakeFuncs.cmake | 5 +++ src/ripple/app/ledger/impl/InboundLedgers.cpp | 30 ++++++------- src/ripple/app/main/Application.cpp | 2 +- src/ripple/app/main/CollectorManager.cpp | 2 +- src/ripple/app/tx/impl/Taker.h | 2 +- src/ripple/basics/CountedObject.h | 4 +- src/ripple/basics/impl/ResolverAsio.cpp | 10 ++--- src/ripple/beast/clock/basic_seconds_clock.h | 2 +- src/ripple/beast/insight/impl/Groups.cpp | 18 ++++---- .../beast/insight/impl/NullCollector.cpp | 22 +++++----- .../beast/insight/impl/StatsDCollector.cpp | 40 ++++++++--------- src/ripple/core/TimeKeeper.h | 2 +- src/ripple/core/impl/SNTPClock.cpp | 2 +- src/ripple/json/JsonPropertyStream.h | 44 +++++++++---------- src/ripple/json/impl/json_value.cpp | 12 ++--- src/ripple/json/json_writer.h | 4 +- src/ripple/net/impl/RPCSub.cpp | 8 ++-- src/ripple/nodestore/Database.h | 2 +- .../nodestore/backend/MemoryFactory.cpp | 8 ++-- src/ripple/nodestore/backend/NuDBFactory.cpp | 8 ++-- src/ripple/nodestore/backend/NullFactory.cpp | 8 ++-- .../nodestore/backend/RocksDBFactory.cpp | 10 ++--- .../nodestore/backend/RocksDBQuickFactory.cpp | 10 ++--- src/ripple/nodestore/impl/BatchWriter.h | 2 +- .../peerfinder/impl/PeerfinderManager.cpp | 2 +- src/ripple/peerfinder/impl/SlotImp.h | 16 +++---- src/ripple/peerfinder/impl/SourceStrings.cpp | 6 +-- src/ripple/peerfinder/impl/StoreSqdb.h | 4 +- src/ripple/protocol/InnerObjectFormats.h | 2 +- src/ripple/protocol/LedgerFormats.h | 2 +- src/ripple/protocol/TxFormats.h | 2 +- src/ripple/rpc/impl/ServerHandlerImp.h | 2 +- src/ripple/rpc/impl/WSInfoSub.h | 2 +- src/ripple/server/impl/Door.h | 2 +- src/test/app/AmendmentTable_test.cpp | 2 +- src/test/app/Check_test.cpp | 2 +- src/test/app/CrossingLimits_test.cpp | 2 +- src/test/app/DeliverMin_test.cpp | 2 +- src/test/app/Discrepancy_test.cpp | 2 +- src/test/app/Freeze_test.cpp | 2 +- src/test/app/HashRouter_test.cpp | 2 +- src/test/app/LedgerHistory_test.cpp | 2 +- src/test/app/LedgerLoad_test.cpp | 2 +- src/test/app/LoadFeeTrack_test.cpp | 2 +- src/test/app/OfferStream_test.cpp | 2 +- src/test/app/OversizeMeta_test.cpp | 4 +- src/test/app/Path_test.cpp | 2 +- src/test/app/SHAMapStore_test.cpp | 2 +- src/test/app/SetRegularKey_test.cpp | 2 +- src/test/app/SetTrust_test.cpp | 2 +- src/test/app/Taker_test.cpp | 4 +- src/test/app/Ticket_test.cpp | 2 +- src/test/app/TrustAndBalance_test.cpp | 2 +- src/test/app/TxQ_test.cpp | 2 +- src/test/basics/Buffer_test.cpp | 2 +- src/test/basics/CheckLibraryVersions_test.cpp | 2 +- src/test/basics/KeyCache_test.cpp | 2 +- src/test/basics/PerfLog_test.cpp | 4 +- src/test/basics/RangeSet_test.cpp | 2 +- src/test/basics/Slice_test.cpp | 2 +- src/test/basics/StringUtilities_test.cpp | 2 +- src/test/basics/TaggedCache_test.cpp | 2 +- src/test/basics/base_uint_test.cpp | 2 +- src/test/basics/contract_test.cpp | 2 +- src/test/basics/hardened_hash_test.cpp | 2 +- src/test/basics/mulDiv_test.cpp | 2 +- src/test/basics/tagged_integer_test.cpp | 2 +- src/test/beast/IPEndpoint_test.cpp | 2 +- src/test/beast/LexicalCast_test.cpp | 2 +- src/test/beast/SemanticVersion_test.cpp | 2 +- .../beast/aged_associative_container_test.cpp | 16 +++---- src/test/beast/beast_Debug_test.cpp | 2 +- src/test/beast/beast_Journal_test.cpp | 2 +- src/test/beast/beast_PropertyStream_test.cpp | 2 +- src/test/beast/beast_Zero_test.cpp | 2 +- src/test/beast/beast_abstract_clock_test.cpp | 2 +- src/test/beast/beast_asio_error_test.cpp | 2 +- .../beast/beast_basic_seconds_clock_test.cpp | 2 +- src/test/beast/beast_weak_fn_test.cpp | 2 +- src/test/beast/define_print.cpp | 2 +- src/test/conditions/PreimageSha256_test.cpp | 2 +- src/test/consensus/LedgerTrie_test.cpp | 2 +- src/test/core/ClosureCounter_test.cpp | 2 +- src/test/core/Config_test.cpp | 2 +- src/test/core/Coroutine_test.cpp | 2 +- src/test/core/CryptoPRNG_test.cpp | 2 +- src/test/core/JobQueue_test.cpp | 2 +- src/test/core/SociDB_test.cpp | 2 +- src/test/core/Stoppable_test.cpp | 4 +- src/test/core/Workers_test.cpp | 2 +- src/test/json/json_value_test.cpp | 2 +- src/test/jtx/Env_test.cpp | 2 +- src/test/ledger/CashDiff_test.cpp | 2 +- src/test/ledger/Invariants_test.cpp | 2 +- src/test/ledger/PaymentSandbox_test.cpp | 2 +- src/test/ledger/SHAMapV2_test.cpp | 2 +- src/test/ledger/SkipList_test.cpp | 2 +- src/test/ledger/View_test.cpp | 2 +- src/test/nodestore/Backend_test.cpp | 2 +- src/test/nodestore/Basics_test.cpp | 2 +- src/test/nodestore/Database_test.cpp | 2 +- src/test/overlay/TMHello_test.cpp | 2 +- src/test/peerfinder/Livecache_test.cpp | 2 +- src/test/peerfinder/PeerFinder_test.cpp | 2 +- src/test/protocol/BuildInfo_test.cpp | 2 +- src/test/protocol/IOUAmount_test.cpp | 2 +- src/test/protocol/InnerObjectFormats_test.cpp | 2 +- src/test/protocol/Issue_test.cpp | 2 +- src/test/protocol/Quality_test.cpp | 2 +- src/test/protocol/STAmount_test.cpp | 2 +- src/test/protocol/STObject_test.cpp | 2 +- src/test/protocol/STTx_test.cpp | 4 +- src/test/protocol/STValidation_test.cpp | 2 +- src/test/protocol/XRPAmount_test.cpp | 2 +- src/test/protocol/digest_test.cpp | 2 +- src/test/resource/Logic_test.cpp | 2 +- src/test/rpc/AccountCurrencies_test.cpp | 2 +- src/test/rpc/AccountInfo_test.cpp | 2 +- src/test/rpc/AccountLinesRPC_test.cpp | 2 +- src/test/rpc/AccountOffers_test.cpp | 2 +- src/test/rpc/AccountSet_test.cpp | 2 +- src/test/rpc/AccountTx_test.cpp | 2 +- src/test/rpc/AmendmentBlocked_test.cpp | 2 +- src/test/rpc/DepositAuthorized_test.cpp | 2 +- src/test/rpc/GetCounts_test.cpp | 2 +- src/test/rpc/JSONRPC_test.cpp | 2 +- src/test/rpc/KeyGeneration_test.cpp | 2 +- src/test/rpc/LedgerClosed_test.cpp | 2 +- src/test/rpc/LedgerData_test.cpp | 2 +- src/test/rpc/LedgerRPC_test.cpp | 2 +- src/test/rpc/LedgerRequestRPC_test.cpp | 2 +- src/test/rpc/NoRippleCheck_test.cpp | 4 +- src/test/rpc/NoRipple_test.cpp | 2 +- src/test/rpc/OwnerInfo_test.cpp | 2 +- src/test/rpc/Peers_test.cpp | 2 +- src/test/rpc/ServerInfo_test.cpp | 2 +- src/test/rpc/Status_test.cpp | 4 +- src/test/rpc/TransactionEntry_test.cpp | 2 +- src/test/rpc/TransactionHistory_test.cpp | 2 +- src/test/rpc/ValidatorRPC_test.cpp | 2 +- src/test/server/ServerStatus_test.cpp | 2 +- src/test/server/Server_test.cpp | 2 +- src/test/shamap/FetchPack_test.cpp | 2 +- src/test/shamap/SHAMapSync_test.cpp | 2 +- src/test/shamap/SHAMap_test.cpp | 2 +- 145 files changed, 276 insertions(+), 271 deletions(-) diff --git a/Builds/CMake/CMakeFuncs.cmake b/Builds/CMake/CMakeFuncs.cmake index e8759cf25..be8c303de 100644 --- a/Builds/CMake/CMakeFuncs.cmake +++ b/Builds/CMake/CMakeFuncs.cmake @@ -589,8 +589,13 @@ macro(setup_build_boilerplate) -DBOOST_ASIO_DISABLE_HANDLER_TYPE_REQUIREMENTS ) + # `ripple.pb.h`, generated from protobuf triggers some warnings + # Set the directory that file lives in as SYSTEM + include_directories(SYSTEM ${CMAKE_BINARY_DIR}) + if (is_gcc) add_compile_options(-Wno-unused-but-set-variable -Wno-deprecated) + append_flags(CMAKE_CXX_FLAGS -Wsuggest-override) # use gold linker if available execute_process( diff --git a/src/ripple/app/ledger/impl/InboundLedgers.cpp b/src/ripple/app/ledger/impl/InboundLedgers.cpp index 0d94abeb7..3ea9b3233 100644 --- a/src/ripple/app/ledger/impl/InboundLedgers.cpp +++ b/src/ripple/app/ledger/impl/InboundLedgers.cpp @@ -66,7 +66,7 @@ public: std::shared_ptr acquire(uint256 const& hash, std::uint32_t seq, - InboundLedger::Reason reason) + InboundLedger::Reason reason) override { assert(hash.isNonZero()); assert(reason != InboundLedger::Reason::SHARD || @@ -125,7 +125,7 @@ public: return inbound->getLedger(); } - std::shared_ptr find (uint256 const& hash) + std::shared_ptr find (uint256 const& hash) override { assert (hash.isNonZero ()); @@ -160,7 +160,7 @@ public: */ bool gotLedgerData (LedgerHash const& hash, std::shared_ptr peer, - std::shared_ptr packet_ptr) + std::shared_ptr packet_ptr) override { protocol::TMLedgerData& packet = *packet_ptr; @@ -196,7 +196,7 @@ public: return true; } - int getFetchCount (int& timeoutCount) + int getFetchCount (int& timeoutCount) override { timeoutCount = 0; int ret = 0; @@ -224,14 +224,14 @@ public: return ret; } - void logFailure (uint256 const& h, std::uint32_t seq) + void logFailure (uint256 const& h, std::uint32_t seq) override { ScopedLockType sl (mLock); mRecentFailures.emplace(h, seq); } - bool isFailure (uint256 const& h) + bool isFailure (uint256 const& h) override { ScopedLockType sl (mLock); @@ -239,7 +239,7 @@ public: return mRecentFailures.find (h) != mRecentFailures.end(); } - void doLedgerData (LedgerHash hash) + void doLedgerData (LedgerHash hash) override { if (auto ledger = find (hash)) ledger->runData (); @@ -251,7 +251,7 @@ public: Nodes are received in wire format and must be stashed/hashed in prefix format */ - void gotStaleData (std::shared_ptr packet_ptr) + void gotStaleData (std::shared_ptr packet_ptr) override { const uint256 uZero; Serializer s; @@ -287,7 +287,7 @@ public: } } - void clearFailures () + void clearFailures () override { ScopedLockType sl (mLock); @@ -295,7 +295,7 @@ public: mLedgers.clear(); } - std::size_t fetchRate() + std::size_t fetchRate() override { std::lock_guard< std::mutex> lock(fetchRateMutex_); @@ -305,13 +305,13 @@ public: // Should only be called with an inboundledger that has // a reason of history or shard - void onLedgerFetched() + void onLedgerFetched() override { std::lock_guard lock(fetchRateMutex_); fetchRate_.add(1, m_clock.now()); } - Json::Value getInfo() + Json::Value getInfo() override { Json::Value ret(Json::objectValue); @@ -348,7 +348,7 @@ public: return ret; } - void gotFetchPack () + void gotFetchPack () override { std::vector> acquires; { @@ -368,7 +368,7 @@ public: } } - void sweep () + void sweep () override { clock_type::time_point const now (m_clock.now()); @@ -411,7 +411,7 @@ public: " out of " << total << " inbound ledgers."; } - void onStop () + void onStop () override { ScopedLockType lock (mLock); diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp index 521eafac5..7f128e824 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -608,7 +608,7 @@ public: return nodeIdentity_; } - virtual + PublicKey const & getValidationPublicKey() const override { diff --git a/src/ripple/app/main/CollectorManager.cpp b/src/ripple/app/main/CollectorManager.cpp index 57da9809c..df12756c4 100644 --- a/src/ripple/app/main/CollectorManager.cpp +++ b/src/ripple/app/main/CollectorManager.cpp @@ -52,7 +52,7 @@ public: m_groups = beast::insight::make_Groups (m_collector); } - ~CollectorManagerImp () + ~CollectorManagerImp () override { } diff --git a/src/ripple/app/tx/impl/Taker.h b/src/ripple/app/tx/impl/Taker.h index a4d9b5157..ca9f7caff 100644 --- a/src/ripple/app/tx/impl/Taker.h +++ b/src/ripple/app/tx/impl/Taker.h @@ -238,7 +238,7 @@ public: consume_offer (Offer& offer, Amounts const& order); STAmount - get_funds (AccountID const& account, STAmount const& funds) const; + get_funds (AccountID const& account, STAmount const& funds) const override; STAmount const& get_xrp_flow () const diff --git a/src/ripple/basics/CountedObject.h b/src/ripple/basics/CountedObject.h index 52e6a6bf9..e402ee0ab 100644 --- a/src/ripple/basics/CountedObject.h +++ b/src/ripple/basics/CountedObject.h @@ -125,12 +125,12 @@ private: public: Counter () { } - char const* getName () const + char const* getName () const override { return Object::getCountedObjectName (); } - void checkPureVirtual () const { } + void checkPureVirtual () const override { } }; private: diff --git a/src/ripple/basics/impl/ResolverAsio.cpp b/src/ripple/basics/impl/ResolverAsio.cpp index c4023492d..4f187642e 100644 --- a/src/ripple/basics/impl/ResolverAsio.cpp +++ b/src/ripple/basics/impl/ResolverAsio.cpp @@ -145,7 +145,7 @@ public: } - ~ResolverAsioImpl () + ~ResolverAsioImpl () override { assert (m_work.empty ()); assert (m_stopped); @@ -164,7 +164,7 @@ public: // //-------------------------------------------------------------------------- - void start () + void start () override { assert (m_stopped == true); assert (m_stop_called == false); @@ -176,7 +176,7 @@ public: } } - void stop_async () + void stop_async () override { if (m_stop_called.exchange (true) == false) { @@ -188,7 +188,7 @@ public: } } - void stop () + void stop () override { stop_async (); @@ -199,7 +199,7 @@ public: void resolve ( std::vector const& names, - HandlerType const& handler) + HandlerType const& handler) override { assert (m_stop_called == false); assert (m_stopped == true); diff --git a/src/ripple/beast/clock/basic_seconds_clock.h b/src/ripple/beast/clock/basic_seconds_clock.h index 441e20da2..a1e1a0893 100644 --- a/src/ripple/beast/clock/basic_seconds_clock.h +++ b/src/ripple/beast/clock/basic_seconds_clock.h @@ -204,7 +204,7 @@ public: return m_now; } - void sample() + void sample() override { std::lock_guard lock (mutex_); m_now = Clock::now(); diff --git a/src/ripple/beast/insight/impl/Groups.cpp b/src/ripple/beast/insight/impl/Groups.cpp index 6a55ae3ff..8d9de1b0d 100644 --- a/src/ripple/beast/insight/impl/Groups.cpp +++ b/src/ripple/beast/insight/impl/Groups.cpp @@ -45,11 +45,11 @@ public: { } - ~GroupImp () + ~GroupImp () override { } - std::string const& name () const + std::string const& name () const override { return m_name; } @@ -59,27 +59,27 @@ public: return m_name + "." + name; } - Hook make_hook (HookImpl::HandlerType const& handler) + Hook make_hook (HookImpl::HandlerType const& handler) override { return m_collector->make_hook (handler); } - Counter make_counter (std::string const& name) + Counter make_counter (std::string const& name) override { return m_collector->make_counter (make_name (name)); } - Event make_event (std::string const& name) + Event make_event (std::string const& name) override { return m_collector->make_event (make_name (name)); } - Gauge make_gauge (std::string const& name) + Gauge make_gauge (std::string const& name) override { return m_collector->make_gauge (make_name (name)); } - Meter make_meter (std::string const& name) + Meter make_meter (std::string const& name) override { return m_collector->make_meter (make_name (name)); } @@ -103,11 +103,11 @@ public: { } - ~GroupsImp () + ~GroupsImp () override { } - Group::ptr const& get (std::string const& name) + Group::ptr const& get (std::string const& name) override { std::pair result ( m_items.emplace (name, Group::ptr ())); diff --git a/src/ripple/beast/insight/impl/NullCollector.cpp b/src/ripple/beast/insight/impl/NullCollector.cpp index 631e5f94a..ed9b18841 100644 --- a/src/ripple/beast/insight/impl/NullCollector.cpp +++ b/src/ripple/beast/insight/impl/NullCollector.cpp @@ -40,7 +40,7 @@ class NullCounterImpl : public CounterImpl public: explicit NullCounterImpl() = default; - void increment (value_type) + void increment (value_type) override { } @@ -55,7 +55,7 @@ class NullEventImpl : public EventImpl public: explicit NullEventImpl() = default; - void notify (value_type const&) + void notify (value_type const&) override { } @@ -70,11 +70,11 @@ class NullGaugeImpl : public GaugeImpl public: explicit NullGaugeImpl() = default; - void set (value_type) + void set (value_type) override { } - void increment (difference_type) + void increment (difference_type) override { } @@ -89,7 +89,7 @@ class NullMeterImpl : public MeterImpl public: explicit NullMeterImpl() = default; - void increment (value_type) + void increment (value_type) override { } @@ -107,31 +107,31 @@ public: { } - ~NullCollectorImp () + ~NullCollectorImp () override { } - Hook make_hook (HookImpl::HandlerType const&) + Hook make_hook (HookImpl::HandlerType const&) override { return Hook (std::make_shared ()); } - Counter make_counter (std::string const&) + Counter make_counter (std::string const&) override { return Counter (std::make_shared ()); } - Event make_event (std::string const&) + Event make_event (std::string const&) override { return Event (std::make_shared ()); } - Gauge make_gauge (std::string const&) + Gauge make_gauge (std::string const&) override { return Gauge (std::make_shared ()); } - Meter make_meter (std::string const&) + Meter make_meter (std::string const&) override { return Meter (std::make_shared ()); } diff --git a/src/ripple/beast/insight/impl/StatsDCollector.cpp b/src/ripple/beast/insight/impl/StatsDCollector.cpp index 89aa9a2cb..c2a30cbf0 100644 --- a/src/ripple/beast/insight/impl/StatsDCollector.cpp +++ b/src/ripple/beast/insight/impl/StatsDCollector.cpp @@ -70,9 +70,9 @@ public: HandlerType const& handler, std::shared_ptr const& impl); - ~StatsDHookImpl (); + ~StatsDHookImpl () override; - void do_process (); + void do_process () override; private: StatsDHookImpl& operator= (StatsDHookImpl const&); @@ -91,13 +91,13 @@ public: StatsDCounterImpl (std::string const& name, std::shared_ptr const& impl); - ~StatsDCounterImpl (); + ~StatsDCounterImpl () override; - void increment (CounterImpl::value_type amount); + void increment (CounterImpl::value_type amount) override; void flush (); void do_increment (CounterImpl::value_type amount); - void do_process (); + void do_process () override; private: StatsDCounterImpl& operator= (StatsDCounterImpl const&); @@ -117,9 +117,9 @@ public: StatsDEventImpl (std::string const& name, std::shared_ptr const& impl); - ~StatsDEventImpl (); + ~StatsDEventImpl () override; - void notify (EventImpl::value_type const& alue); + void notify (EventImpl::value_type const& alue) override; void do_notify (EventImpl::value_type const& value); void do_process (); @@ -141,15 +141,15 @@ public: StatsDGaugeImpl (std::string const& name, std::shared_ptr const& impl); - ~StatsDGaugeImpl (); + ~StatsDGaugeImpl () override; - void set (GaugeImpl::value_type value); - void increment (GaugeImpl::difference_type amount); + void set (GaugeImpl::value_type value) override; + void increment (GaugeImpl::difference_type amount) override; void flush (); void do_set (GaugeImpl::value_type value); void do_increment (GaugeImpl::difference_type amount); - void do_process (); + void do_process () override; private: StatsDGaugeImpl& operator= (StatsDGaugeImpl const&); @@ -171,13 +171,13 @@ public: explicit StatsDMeterImpl (std::string const& name, std::shared_ptr const& impl); - ~StatsDMeterImpl (); + ~StatsDMeterImpl () override; - void increment (MeterImpl::value_type amount); + void increment (MeterImpl::value_type amount) override; void flush (); void do_increment (MeterImpl::value_type amount); - void do_process (); + void do_process () override; private: StatsDMeterImpl& operator= (StatsDMeterImpl const&); @@ -248,7 +248,7 @@ public: { } - ~StatsDCollectorImp () + ~StatsDCollectorImp () override { boost::system::error_code ec; m_timer.cancel (ec); @@ -257,31 +257,31 @@ public: m_thread.join (); } - Hook make_hook (HookImpl::HandlerType const& handler) + Hook make_hook (HookImpl::HandlerType const& handler) override { return Hook (std::make_shared ( handler, shared_from_this ())); } - Counter make_counter (std::string const& name) + Counter make_counter (std::string const& name) override { return Counter (std::make_shared ( name, shared_from_this ())); } - Event make_event (std::string const& name) + Event make_event (std::string const& name) override { return Event (std::make_shared ( name, shared_from_this ())); } - Gauge make_gauge (std::string const& name) + Gauge make_gauge (std::string const& name) override { return Gauge (std::make_shared ( name, shared_from_this ())); } - Meter make_meter (std::string const& name) + Meter make_meter (std::string const& name) override { return Meter (std::make_shared ( name, shared_from_this ())); diff --git a/src/ripple/core/TimeKeeper.h b/src/ripple/core/TimeKeeper.h index 22d5a2cc4..379a57422 100644 --- a/src/ripple/core/TimeKeeper.h +++ b/src/ripple/core/TimeKeeper.h @@ -58,7 +58,7 @@ public: */ virtual time_point - now() const = 0; + now() const override = 0; /** Returns the close time, in network time. diff --git a/src/ripple/core/impl/SNTPClock.cpp b/src/ripple/core/impl/SNTPClock.cpp index 20d5f030d..987a34e12 100644 --- a/src/ripple/core/impl/SNTPClock.cpp +++ b/src/ripple/core/impl/SNTPClock.cpp @@ -123,7 +123,7 @@ public: { } - ~SNTPClientImp () + ~SNTPClientImp () override { if (thread_.joinable()) { diff --git a/src/ripple/json/JsonPropertyStream.h b/src/ripple/json/JsonPropertyStream.h index 35b20891f..7e4658e9c 100644 --- a/src/ripple/json/JsonPropertyStream.h +++ b/src/ripple/json/JsonPropertyStream.h @@ -38,29 +38,29 @@ public: protected: - void map_begin (); - void map_begin (std::string const& key); - void map_end (); - void add (std::string const& key, short value); - void add (std::string const& key, unsigned short value); - void add (std::string const& key, int value); - void add (std::string const& key, unsigned int value); - void add (std::string const& key, long value); - void add (std::string const& key, float v); - void add (std::string const& key, double v); - void add (std::string const& key, std::string const& v); - void array_begin (); - void array_begin (std::string const& key); - void array_end (); + void map_begin () override; + void map_begin (std::string const& key) override; + void map_end () override; + void add (std::string const& key, short value) override; + void add (std::string const& key, unsigned short value) override; + void add (std::string const& key, int value) override; + void add (std::string const& key, unsigned int value) override; + void add (std::string const& key, long value) override; + void add (std::string const& key, float v) override; + void add (std::string const& key, double v) override; + void add (std::string const& key, std::string const& v) override; + void array_begin () override; + void array_begin (std::string const& key) override; + void array_end () override; - void add (short value); - void add (unsigned short value); - void add (int value); - void add (unsigned int value); - void add (long value); - void add (float v); - void add (double v); - void add (std::string const& v); + void add (short value) override; + void add (unsigned short value) override; + void add (int value) override; + void add (unsigned int value) override; + void add (long value) override; + void add (float v) override; + void add (double v) override; + void add (std::string const& v) override; }; } diff --git a/src/ripple/json/impl/json_value.cpp b/src/ripple/json/impl/json_value.cpp index 7c44e0b93..4c5036fef 100644 --- a/src/ripple/json/impl/json_value.cpp +++ b/src/ripple/json/impl/json_value.cpp @@ -37,22 +37,22 @@ ValueAllocator::~ValueAllocator () class DefaultValueAllocator : public ValueAllocator { public: - virtual ~DefaultValueAllocator () + ~DefaultValueAllocator () override { } - virtual char* makeMemberName ( const char* memberName ) + char* makeMemberName ( const char* memberName ) override { return duplicateStringValue ( memberName ); } - virtual void releaseMemberName ( char* memberName ) + void releaseMemberName ( char* memberName ) override { releaseStringValue ( memberName ); } - virtual char* duplicateStringValue ( const char* value, - unsigned int length = unknown ) + char* duplicateStringValue ( const char* value, + unsigned int length = unknown ) override { //@todo invesgate this old optimization //if ( !value || value[0] == 0 ) @@ -67,7 +67,7 @@ public: return newString; } - virtual void releaseStringValue ( char* value ) + void releaseStringValue ( char* value ) override { if ( value ) free ( value ); diff --git a/src/ripple/json/json_writer.h b/src/ripple/json/json_writer.h index 48a5374d5..ed3d80980 100644 --- a/src/ripple/json/json_writer.h +++ b/src/ripple/json/json_writer.h @@ -53,7 +53,7 @@ public: virtual ~FastWriter () {} public: // overridden from Writer - virtual std::string write ( const Value& root ); + std::string write ( const Value& root ) override; private: void writeValue ( const Value& value ); @@ -90,7 +90,7 @@ public: // overridden from Writer * \param root Value to serialize. * \return String containing the JSON document that represents the root value. */ - virtual std::string write ( const Value& root ); + std::string write ( const Value& root ) override; private: void writeValue ( const Value& value ); diff --git a/src/ripple/net/impl/RPCSub.cpp b/src/ripple/net/impl/RPCSub.cpp index f1b184be5..a68db408a 100644 --- a/src/ripple/net/impl/RPCSub.cpp +++ b/src/ripple/net/impl/RPCSub.cpp @@ -68,11 +68,11 @@ public: " path='" << mPath << "'"; } - ~RPCSubImp () + ~RPCSubImp () override { } - void send (Json::Value const& jvObj, bool broadcast) + void send (Json::Value const& jvObj, bool broadcast) override { ScopedLockType sl (mLock); @@ -101,14 +101,14 @@ public: } } - void setUsername (std::string const& strUsername) + void setUsername (std::string const& strUsername) override { ScopedLockType sl (mLock); mUsername = strUsername; } - void setPassword (std::string const& strPassword) + void setPassword (std::string const& strPassword) override { ScopedLockType sl (mLock); diff --git a/src/ripple/nodestore/Database.h b/src/ripple/nodestore/Database.h index a2f50f2e7..202379f74 100644 --- a/src/ripple/nodestore/Database.h +++ b/src/ripple/nodestore/Database.h @@ -208,7 +208,7 @@ public: fdlimit() const { return fdLimit_; } void - onStop(); + onStop() override; /** @return The earliest ledger sequence allowed */ diff --git a/src/ripple/nodestore/backend/MemoryFactory.cpp b/src/ripple/nodestore/backend/MemoryFactory.cpp index 72c6bf84f..3ed6ad080 100644 --- a/src/ripple/nodestore/backend/MemoryFactory.cpp +++ b/src/ripple/nodestore/backend/MemoryFactory.cpp @@ -45,17 +45,17 @@ private: public: MemoryFactory(); - ~MemoryFactory(); + ~MemoryFactory() override; std::string - getName() const; + getName() const override; std::unique_ptr createInstance ( size_t keyBytes, Section const& keyValues, Scheduler& scheduler, - beast::Journal journal); + beast::Journal journal) override; MemoryDB& open (std::string const& path) @@ -93,7 +93,7 @@ public: Throw ("Missing path in Memory backend"); } - ~MemoryBackend () + ~MemoryBackend () override { close(); } diff --git a/src/ripple/nodestore/backend/NuDBFactory.cpp b/src/ripple/nodestore/backend/NuDBFactory.cpp index a39833c26..546342139 100644 --- a/src/ripple/nodestore/backend/NuDBFactory.cpp +++ b/src/ripple/nodestore/backend/NuDBFactory.cpp @@ -69,7 +69,7 @@ public: "nodestore: Missing path in NuDB backend"); } - ~NuDBBackend () + ~NuDBBackend () override { close(); } @@ -296,13 +296,13 @@ public: Manager::instance().insert(*this); } - ~NuDBFactory() + ~NuDBFactory() override { Manager::instance().erase(*this); } std::string - getName() const + getName() const override { return "NuDB"; } @@ -312,7 +312,7 @@ public: size_t keyBytes, Section const& keyValues, Scheduler& scheduler, - beast::Journal journal) + beast::Journal journal) override { return std::make_unique ( keyBytes, keyValues, scheduler, journal); diff --git a/src/ripple/nodestore/backend/NullFactory.cpp b/src/ripple/nodestore/backend/NullFactory.cpp index 39b29d84e..3eef00e8b 100644 --- a/src/ripple/nodestore/backend/NullFactory.cpp +++ b/src/ripple/nodestore/backend/NullFactory.cpp @@ -32,7 +32,7 @@ public: { } - ~NullBackend () + ~NullBackend () override { } @@ -122,13 +122,13 @@ public: Manager::instance().insert(*this); } - ~NullFactory() + ~NullFactory() override { Manager::instance().erase(*this); } std::string - getName () const + getName () const override { return "none"; } @@ -137,7 +137,7 @@ public: createInstance ( size_t, Section const&, - Scheduler&, beast::Journal) + Scheduler&, beast::Journal) override { return std::make_unique (); } diff --git a/src/ripple/nodestore/backend/RocksDBFactory.cpp b/src/ripple/nodestore/backend/RocksDBFactory.cpp index ec2c0a6f0..fd348a453 100644 --- a/src/ripple/nodestore/backend/RocksDBFactory.cpp +++ b/src/ripple/nodestore/backend/RocksDBFactory.cpp @@ -75,7 +75,7 @@ public: } void - StartThread (void (*f)(void*), void* a) + StartThread (void (*f)(void*), void* a) override { ThreadParams* const p (new ThreadParams (f, a)); EnvWrapper::StartThread (&RocksDBEnv::thread_entry, p); @@ -202,7 +202,7 @@ public: JLOG(m_journal.debug()) << "RocksDB CFOptions: " << s2; } - ~RocksDBBackend () + ~RocksDBBackend () override { close(); } @@ -428,13 +428,13 @@ public: Manager::instance().insert(*this); } - ~RocksDBFactory () + ~RocksDBFactory () override { Manager::instance().erase(*this); } std::string - getName () const + getName () const override { return "RocksDB"; } @@ -444,7 +444,7 @@ public: size_t keyBytes, Section const& keyValues, Scheduler& scheduler, - beast::Journal journal) + beast::Journal journal) override { return std::make_unique ( keyBytes, keyValues, scheduler, journal, &m_env); diff --git a/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp b/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp index d09ce7f89..9e9a94f73 100644 --- a/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp +++ b/src/ripple/nodestore/backend/RocksDBQuickFactory.cpp @@ -74,7 +74,7 @@ public: } void - StartThread (void (*f)(void*), void* a) + StartThread (void (*f)(void*), void* a) override { ThreadParams* const p (new ThreadParams (f, a)); EnvWrapper::StartThread (&RocksDBQuickEnv::thread_entry, p); @@ -167,7 +167,7 @@ public: m_options.compression = rocksdb::kNoCompression; } - ~RocksDBQuickBackend () + ~RocksDBQuickBackend () override { close(); } @@ -396,13 +396,13 @@ public: Manager::instance().insert(*this); } - ~RocksDBQuickFactory() + ~RocksDBQuickFactory() override { Manager::instance().erase(*this); } std::string - getName () const + getName () const override { return "RocksDBQuick"; } @@ -412,7 +412,7 @@ public: size_t keyBytes, Section const& keyValues, Scheduler& scheduler, - beast::Journal journal) + beast::Journal journal) override { return std::make_unique ( keyBytes, keyValues, scheduler, journal, &m_env); diff --git a/src/ripple/nodestore/impl/BatchWriter.h b/src/ripple/nodestore/impl/BatchWriter.h index 57bc486fe..b341c8ff2 100644 --- a/src/ripple/nodestore/impl/BatchWriter.h +++ b/src/ripple/nodestore/impl/BatchWriter.h @@ -71,7 +71,7 @@ public: int getWriteLoad (); private: - void performScheduledTask (); + void performScheduledTask () override; void writeBatch (); void waitForWriting (); diff --git a/src/ripple/peerfinder/impl/PeerfinderManager.cpp b/src/ripple/peerfinder/impl/PeerfinderManager.cpp index c1c85e31a..f05e24bb6 100644 --- a/src/ripple/peerfinder/impl/PeerfinderManager.cpp +++ b/src/ripple/peerfinder/impl/PeerfinderManager.cpp @@ -65,7 +65,7 @@ public: { } - ~ManagerImp() + ~ManagerImp() override { close(); } diff --git a/src/ripple/peerfinder/impl/SlotImp.h b/src/ripple/peerfinder/impl/SlotImp.h index f5679a933..3c0c45496 100644 --- a/src/ripple/peerfinder/impl/SlotImp.h +++ b/src/ripple/peerfinder/impl/SlotImp.h @@ -48,42 +48,42 @@ public: SlotImp (beast::IP::Endpoint const& remote_endpoint, bool fixed, clock_type& clock); - bool inbound () const + bool inbound () const override { return m_inbound; } - bool fixed () const + bool fixed () const override { return m_fixed; } - bool cluster () const + bool cluster () const override { return m_cluster; } - State state () const + State state () const override { return m_state; } - beast::IP::Endpoint const& remote_endpoint () const + beast::IP::Endpoint const& remote_endpoint () const override { return m_remote_endpoint; } - boost::optional const& local_endpoint () const + boost::optional const& local_endpoint () const override { return m_local_endpoint; } - boost::optional const& public_key () const + boost::optional const& public_key () const override { return m_public_key; } - boost::optional listening_port () const + boost::optional listening_port () const override { std::uint32_t const value = m_listening_port; if (value == unknownPort) diff --git a/src/ripple/peerfinder/impl/SourceStrings.cpp b/src/ripple/peerfinder/impl/SourceStrings.cpp index 486dbd47f..39337fabc 100644 --- a/src/ripple/peerfinder/impl/SourceStrings.cpp +++ b/src/ripple/peerfinder/impl/SourceStrings.cpp @@ -31,16 +31,16 @@ public: { } - ~SourceStringsImp () + ~SourceStringsImp () override { } - std::string const& name () + std::string const& name () override { return m_name; } - void fetch (Results& results, beast::Journal journal) + void fetch (Results& results, beast::Journal journal) override { results.addresses.resize (0); results.addresses.reserve (m_strings.size()); diff --git a/src/ripple/peerfinder/impl/StoreSqdb.h b/src/ripple/peerfinder/impl/StoreSqdb.h index 2c2396286..f767ee330 100644 --- a/src/ripple/peerfinder/impl/StoreSqdb.h +++ b/src/ripple/peerfinder/impl/StoreSqdb.h @@ -64,7 +64,7 @@ public: // Loads the bootstrap cache, calling the callback for each entry // - std::size_t load (load_callback const& cb) + std::size_t load (load_callback const& cb) override { std::size_t n (0); std::string s; @@ -100,7 +100,7 @@ public: // Overwrites the stored bootstrap cache with the specified array. // - void save (std::vector const& v) + void save (std::vector const& v) override { soci::transaction tr (m_session); m_session << diff --git a/src/ripple/protocol/InnerObjectFormats.h b/src/ripple/protocol/InnerObjectFormats.h index 50b05dd9d..f573eb9af 100755 --- a/src/ripple/protocol/InnerObjectFormats.h +++ b/src/ripple/protocol/InnerObjectFormats.h @@ -29,7 +29,7 @@ namespace ripple { class InnerObjectFormats : public KnownFormats { private: - void addCommonFields (Item& item); + void addCommonFields (Item& item) override; public: virtual ~InnerObjectFormats () = default; diff --git a/src/ripple/protocol/LedgerFormats.h b/src/ripple/protocol/LedgerFormats.h index 4e1bab0ef..92f1da7ac 100644 --- a/src/ripple/protocol/LedgerFormats.h +++ b/src/ripple/protocol/LedgerFormats.h @@ -167,7 +167,7 @@ public: static LedgerFormats const& getInstance (); private: - void addCommonFields (Item& item); + void addCommonFields (Item& item) override; }; } // ripple diff --git a/src/ripple/protocol/TxFormats.h b/src/ripple/protocol/TxFormats.h index 73c2721cd..e23fb75cc 100644 --- a/src/ripple/protocol/TxFormats.h +++ b/src/ripple/protocol/TxFormats.h @@ -65,7 +65,7 @@ enum TxType class TxFormats : public KnownFormats { private: - void addCommonFields (Item& item); + void addCommonFields (Item& item) override; public: /** Create the object. diff --git a/src/ripple/rpc/impl/ServerHandlerImp.h b/src/ripple/rpc/impl/ServerHandlerImp.h index b36b762de..1441d0cf3 100644 --- a/src/ripple/rpc/impl/ServerHandlerImp.h +++ b/src/ripple/rpc/impl/ServerHandlerImp.h @@ -121,7 +121,7 @@ public: // void - onStop(); + onStop() override; // // Handler diff --git a/src/ripple/rpc/impl/WSInfoSub.h b/src/ripple/rpc/impl/WSInfoSub.h index 183084910..48157cd2f 100644 --- a/src/ripple/rpc/impl/WSInfoSub.h +++ b/src/ripple/rpc/impl/WSInfoSub.h @@ -68,7 +68,7 @@ public: } void - send(Json::Value const& jv, bool) + send(Json::Value const& jv, bool) override { auto sp = ws_.lock(); if(! sp) diff --git a/src/ripple/server/impl/Door.h b/src/ripple/server/impl/Door.h index bb4a069db..32934101c 100644 --- a/src/ripple/server/impl/Door.h +++ b/src/ripple/server/impl/Door.h @@ -104,7 +104,7 @@ public: Thread Safety: May be called concurrently */ - void close(); + void close() override; endpoint_type get_endpoint() const { diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp index 24f257924..f056632ba 100644 --- a/src/test/app/AmendmentTable_test.cpp +++ b/src/test/app/AmendmentTable_test.cpp @@ -757,7 +757,7 @@ public: BEAST_EXPECT(table->hasUnsupportedEnabled()); } - void run () + void run () override { testConstruct(); testGet (); diff --git a/src/test/app/Check_test.cpp b/src/test/app/Check_test.cpp index 2603f700d..71ab664c6 100644 --- a/src/test/app/Check_test.cpp +++ b/src/test/app/Check_test.cpp @@ -1817,7 +1817,7 @@ class Check_test : public beast::unit_test::suite } public: - void run () + void run () override { testEnabled(); testCreateValid(); diff --git a/src/test/app/CrossingLimits_test.cpp b/src/test/app/CrossingLimits_test.cpp index 377437e7f..d7af52321 100644 --- a/src/test/app/CrossingLimits_test.cpp +++ b/src/test/app/CrossingLimits_test.cpp @@ -257,7 +257,7 @@ public: } void - run() + run() override { auto testAll = [this](FeatureBitset features) { testStepLimit(features); diff --git a/src/test/app/DeliverMin_test.cpp b/src/test/app/DeliverMin_test.cpp index 299b15bb3..8a23f0a51 100644 --- a/src/test/app/DeliverMin_test.cpp +++ b/src/test/app/DeliverMin_test.cpp @@ -108,7 +108,7 @@ public: } void - run() + run() override { using namespace jtx; auto const sa = supported_amendments(); diff --git a/src/test/app/Discrepancy_test.cpp b/src/test/app/Discrepancy_test.cpp index 58003ff29..6a23bdf3c 100644 --- a/src/test/app/Discrepancy_test.cpp +++ b/src/test/app/Discrepancy_test.cpp @@ -141,7 +141,7 @@ class Discrepancy_test : public beast::unit_test::suite } public: - void run () + void run () override { using namespace test::jtx; auto const sa = supported_amendments(); diff --git a/src/test/app/Freeze_test.cpp b/src/test/app/Freeze_test.cpp index 74db440e5..bd2e8551a 100644 --- a/src/test/app/Freeze_test.cpp +++ b/src/test/app/Freeze_test.cpp @@ -521,7 +521,7 @@ class Freeze_test : public beast::unit_test::suite public: - void run() + void run() override { auto testAll = [this](FeatureBitset features) { diff --git a/src/test/app/HashRouter_test.cpp b/src/test/app/HashRouter_test.cpp index 2803861a7..84215aca8 100644 --- a/src/test/app/HashRouter_test.cpp +++ b/src/test/app/HashRouter_test.cpp @@ -284,7 +284,7 @@ class HashRouter_test : public beast::unit_test::suite public: void - run() + run() override { testNonExpiration(); testExpiration(); diff --git a/src/test/app/LedgerHistory_test.cpp b/src/test/app/LedgerHistory_test.cpp index bc5b02b75..dc5574a3d 100644 --- a/src/test/app/LedgerHistory_test.cpp +++ b/src/test/app/LedgerHistory_test.cpp @@ -239,7 +239,7 @@ public: } void - run() + run() override { testHandleMismatch(); } diff --git a/src/test/app/LedgerLoad_test.cpp b/src/test/app/LedgerLoad_test.cpp index a751a6d1e..9b3ea5be1 100644 --- a/src/test/app/LedgerLoad_test.cpp +++ b/src/test/app/LedgerLoad_test.cpp @@ -217,7 +217,7 @@ class LedgerLoad_test : public beast::unit_test::suite } public: - void run () + void run () override { beast::temp_dir td; auto sd = setupLedger(td); diff --git a/src/test/app/LoadFeeTrack_test.cpp b/src/test/app/LoadFeeTrack_test.cpp index d505af709..973ed1505 100644 --- a/src/test/app/LoadFeeTrack_test.cpp +++ b/src/test/app/LoadFeeTrack_test.cpp @@ -27,7 +27,7 @@ namespace ripple { class LoadFeeTrack_test : public beast::unit_test::suite { public: - void run () + void run () override { Config d; // get a default configuration object LoadFeeTrack l; diff --git a/src/test/app/OfferStream_test.cpp b/src/test/app/OfferStream_test.cpp index 4b407acd4..db0092c78 100644 --- a/src/test/app/OfferStream_test.cpp +++ b/src/test/app/OfferStream_test.cpp @@ -32,7 +32,7 @@ public: } void - run() + run() override { test(); } diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp index 6dc334277..5e3fc4295 100644 --- a/src/test/app/OversizeMeta_test.cpp +++ b/src/test/app/OversizeMeta_test.cpp @@ -115,7 +115,7 @@ public: } void - run() + run() override { test(); } @@ -181,7 +181,7 @@ public: } void - run() + run() override { auto const result = bfind(100, 9000, [&](std::size_t n) { return oversize(n); }); diff --git a/src/test/app/Path_test.cpp b/src/test/app/Path_test.cpp index a62749bea..2fe8d78f2 100644 --- a/src/test/app/Path_test.cpp +++ b/src/test/app/Path_test.cpp @@ -1352,7 +1352,7 @@ public: } void - run() + run() override { source_currencies_limit(); no_direct_path_no_intermediary_no_alternatives(); diff --git a/src/test/app/SHAMapStore_test.cpp b/src/test/app/SHAMapStore_test.cpp index bc4ebfdb2..c59205b03 100644 --- a/src/test/app/SHAMapStore_test.cpp +++ b/src/test/app/SHAMapStore_test.cpp @@ -623,7 +623,7 @@ public: lastRotated = ledgerSeq - 1; } - void run() + void run() override { testClear(); testAutomatic(); diff --git a/src/test/app/SetRegularKey_test.cpp b/src/test/app/SetRegularKey_test.cpp index 4ee75c311..e190a384d 100644 --- a/src/test/app/SetRegularKey_test.cpp +++ b/src/test/app/SetRegularKey_test.cpp @@ -92,7 +92,7 @@ public: env(jv, ter(temINVALID_FLAG)); } - void run() + void run() override { testDisableMasterKey(); testPasswordSpent(); diff --git a/src/test/app/SetTrust_test.cpp b/src/test/app/SetTrust_test.cpp index 89c505c37..c64fd3632 100644 --- a/src/test/app/SetTrust_test.cpp +++ b/src/test/app/SetTrust_test.cpp @@ -204,7 +204,7 @@ public: } - void run() + void run() override { testFreeTrustlines(true, false); testFreeTrustlines(false, true); diff --git a/src/test/app/Taker_test.cpp b/src/test/app/Taker_test.cpp index d3ebe74e3..f4880ccd7 100644 --- a/src/test/app/Taker_test.cpp +++ b/src/test/app/Taker_test.cpp @@ -63,7 +63,7 @@ class Taker_test : public beast::unit_test::suite } STAmount - get_funds (AccountID const& owner, STAmount const& funds) const + get_funds (AccountID const& owner, STAmount const& funds) const override { if (owner == account ()) return funds_; @@ -358,7 +358,7 @@ public: } void - run() + run() override { test_xrp_to_iou (); test_iou_to_xrp (); diff --git a/src/test/app/Ticket_test.cpp b/src/test/app/Ticket_test.cpp index 2bb096688..8c8d28db4 100644 --- a/src/test/app/Ticket_test.cpp +++ b/src/test/app/Ticket_test.cpp @@ -379,7 +379,7 @@ class Ticket_test : public beast::unit_test::suite } public: - void run () + void run () override { testTicketNotEnabled (); testTicketCancelNonexistent (); diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index fd710f948..5e3fbbc9e 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -487,7 +487,7 @@ class TrustAndBalance_test : public beast::unit_test::suite } public: - void run () + void run () override { testTrustNonexistent (); testCreditLimit (); diff --git a/src/test/app/TxQ_test.cpp b/src/test/app/TxQ_test.cpp index 1228d05c7..05cec4594 100644 --- a/src/test/app/TxQ_test.cpp +++ b/src/test/app/TxQ_test.cpp @@ -2774,7 +2774,7 @@ public: } } - void run() + void run() override { testQueue(); testLocalTxRetry(); diff --git a/src/test/basics/Buffer_test.cpp b/src/test/basics/Buffer_test.cpp index c3ee9faec..bffea7fd7 100644 --- a/src/test/basics/Buffer_test.cpp +++ b/src/test/basics/Buffer_test.cpp @@ -34,7 +34,7 @@ struct Buffer_test : beast::unit_test::suite return b.data() != nullptr; } - void run() + void run() override { std::uint8_t const data[] = { diff --git a/src/test/basics/CheckLibraryVersions_test.cpp b/src/test/basics/CheckLibraryVersions_test.cpp index 5531d8e6c..cb5e363f4 100644 --- a/src/test/basics/CheckLibraryVersions_test.cpp +++ b/src/test/basics/CheckLibraryVersions_test.cpp @@ -40,7 +40,7 @@ struct CheckLibraryVersions_test : beast::unit_test::suite except ([&]{ checkBoost ("1.54.0"); }); } - void run() + void run() override { unexcept ([&]{ checkLibraryVersions(); }); diff --git a/src/test/basics/KeyCache_test.cpp b/src/test/basics/KeyCache_test.cpp index b743b0471..34616e9d8 100644 --- a/src/test/basics/KeyCache_test.cpp +++ b/src/test/basics/KeyCache_test.cpp @@ -27,7 +27,7 @@ namespace ripple { class KeyCache_test : public beast::unit_test::suite { public: - void run () + void run () override { TestStopwatch clock; clock.set (0); diff --git a/src/test/basics/PerfLog_test.cpp b/src/test/basics/PerfLog_test.cpp index 79c91fa78..985d21f6e 100644 --- a/src/test/basics/PerfLog_test.cpp +++ b/src/test/basics/PerfLog_test.cpp @@ -64,7 +64,7 @@ class PerfLog_test : public beast::unit_test::suite , j_ (j) { } - ~PerfLogParent() + ~PerfLogParent() override { doStop(); cleanupPerfLogDir(); @@ -1067,7 +1067,7 @@ public: } } - void run() + void run() override { testFileCreation(); testRPC (WithFile::no); diff --git a/src/test/basics/RangeSet_test.cpp b/src/test/basics/RangeSet_test.cpp index 37d933885..2318398bf 100644 --- a/src/test/basics/RangeSet_test.cpp +++ b/src/test/basics/RangeSet_test.cpp @@ -106,7 +106,7 @@ public: } void - run() + run() override { testPrevMissing(); testToString(); diff --git a/src/test/basics/Slice_test.cpp b/src/test/basics/Slice_test.cpp index 0d5834824..a0e00e1b3 100644 --- a/src/test/basics/Slice_test.cpp +++ b/src/test/basics/Slice_test.cpp @@ -27,7 +27,7 @@ namespace test { struct Slice_test : beast::unit_test::suite { - void run() + void run() override { std::uint8_t const data[] = { diff --git a/src/test/basics/StringUtilities_test.cpp b/src/test/basics/StringUtilities_test.cpp index ad1634baa..d7a0d9049 100644 --- a/src/test/basics/StringUtilities_test.cpp +++ b/src/test/basics/StringUtilities_test.cpp @@ -86,7 +86,7 @@ public: BEAST_EXPECT(result == "hello"); } - void run () + void run () override { testParseUrl (); testUnHex (); diff --git a/src/test/basics/TaggedCache_test.cpp b/src/test/basics/TaggedCache_test.cpp index 27e80f933..d826dcac3 100644 --- a/src/test/basics/TaggedCache_test.cpp +++ b/src/test/basics/TaggedCache_test.cpp @@ -37,7 +37,7 @@ original object. class TaggedCache_test : public beast::unit_test::suite { public: - void run () + void run () override { beast::Journal const j; diff --git a/src/test/basics/base_uint_test.cpp b/src/test/basics/base_uint_test.cpp index 726957359..ed2820e55 100644 --- a/src/test/basics/base_uint_test.cpp +++ b/src/test/basics/base_uint_test.cpp @@ -51,7 +51,7 @@ struct base_uint_test : beast::unit_test::suite { using test96 = base_uint<96>; - void run() + void run() override { // used to verify set insertion (hashing required) std::unordered_set> uset; diff --git a/src/test/basics/contract_test.cpp b/src/test/basics/contract_test.cpp index 57e04979f..24b7e30d4 100644 --- a/src/test/basics/contract_test.cpp +++ b/src/test/basics/contract_test.cpp @@ -26,7 +26,7 @@ namespace ripple { class contract_test : public beast::unit_test::suite { public: - void run () + void run () override { try { diff --git a/src/test/basics/hardened_hash_test.cpp b/src/test/basics/hardened_hash_test.cpp index 2469f5b86..ac38d2bda 100644 --- a/src/test/basics/hardened_hash_test.cpp +++ b/src/test/basics/hardened_hash_test.cpp @@ -254,7 +254,7 @@ public: } void - run () + run () override { test_user_types(); test_containers(); diff --git a/src/test/basics/mulDiv_test.cpp b/src/test/basics/mulDiv_test.cpp index 622fb0dda..21e335dd2 100644 --- a/src/test/basics/mulDiv_test.cpp +++ b/src/test/basics/mulDiv_test.cpp @@ -25,7 +25,7 @@ namespace test { struct mulDiv_test : beast::unit_test::suite { - void run() + void run() override { const auto max = std::numeric_limits::max(); const std::uint64_t max32 = std::numeric_limits::max(); diff --git a/src/test/basics/tagged_integer_test.cpp b/src/test/basics/tagged_integer_test.cpp index ca083a79c..dd62bffac 100644 --- a/src/test/basics/tagged_integer_test.cpp +++ b/src/test/basics/tagged_integer_test.cpp @@ -103,7 +103,7 @@ private: public: - void run () + void run () override { using TagInt = tagged_integer; diff --git a/src/test/beast/IPEndpoint_test.cpp b/src/test/beast/IPEndpoint_test.cpp index 61a66bd18..5e486f8b9 100644 --- a/src/test/beast/IPEndpoint_test.cpp +++ b/src/test/beast/IPEndpoint_test.cpp @@ -335,7 +335,7 @@ public: shouldFail ("1.2.3:72131"); } - void run () + void run () override { testAddressV4 (); testAddressV4Proxy(); diff --git a/src/test/beast/LexicalCast_test.cpp b/src/test/beast/LexicalCast_test.cpp index 32281f583..9f138f732 100644 --- a/src/test/beast/LexicalCast_test.cpp +++ b/src/test/beast/LexicalCast_test.cpp @@ -252,7 +252,7 @@ public: } } - void run() + void run() override { std::int64_t const seedValue = 50; diff --git a/src/test/beast/SemanticVersion_test.cpp b/src/test/beast/SemanticVersion_test.cpp index 3a51d33c2..cce0bff5d 100644 --- a/src/test/beast/SemanticVersion_test.cpp +++ b/src/test/beast/SemanticVersion_test.cpp @@ -248,7 +248,7 @@ public: checkLess("0.9.9", "1.0.0"); } - void run() + void run() override { testParse(); testValues(); diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp index de5a2cab7..f62014684 100644 --- a/src/test/beast/aged_associative_container_test.cpp +++ b/src/test/beast/aged_associative_container_test.cpp @@ -1910,7 +1910,7 @@ public: detail::aged_unordered_container >::value, "bad alias: aged_unordered_multimap"); - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1919,7 +1919,7 @@ public: class aged_map_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1928,7 +1928,7 @@ public: class aged_multiset_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1937,7 +1937,7 @@ public: class aged_multimap_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1947,7 +1947,7 @@ public: class aged_unordered_set_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1956,7 +1956,7 @@ public: class aged_unordered_map_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1965,7 +1965,7 @@ public: class aged_unordered_multiset_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } @@ -1974,7 +1974,7 @@ public: class aged_unordered_multimap_test : public aged_associative_container_test_base { public: - void run () + void run () override { testMaybeUnorderedMultiMap (); } diff --git a/src/test/beast/beast_Debug_test.cpp b/src/test/beast/beast_Debug_test.cpp index ef5fea017..c9a68204b 100644 --- a/src/test/beast/beast_Debug_test.cpp +++ b/src/test/beast/beast_Debug_test.cpp @@ -52,7 +52,7 @@ public: #endif } - void run() + void run() override { log << "_DEBUG = " << envDebug() << '\n' << diff --git a/src/test/beast/beast_Journal_test.cpp b/src/test/beast/beast_Journal_test.cpp index 95a2c2649..527639452 100644 --- a/src/test/beast/beast_Journal_test.cpp +++ b/src/test/beast/beast_Journal_test.cpp @@ -57,7 +57,7 @@ public: } }; - void run () + void run () override { TestSink sink; diff --git a/src/test/beast/beast_PropertyStream_test.cpp b/src/test/beast/beast_PropertyStream_test.cpp index 36c8ef988..fd8d87915 100644 --- a/src/test/beast/beast_PropertyStream_test.cpp +++ b/src/test/beast/beast_PropertyStream_test.cpp @@ -126,7 +126,7 @@ public: } } - void run() + void run() override { Source a("a"); Source b("b"); diff --git a/src/test/beast/beast_Zero_test.cpp b/src/test/beast/beast_Zero_test.cpp index f9d645c1c..3befd2176 100644 --- a/src/test/beast/beast_Zero_test.cpp +++ b/src/test/beast/beast_Zero_test.cpp @@ -128,7 +128,7 @@ public: } void - run() + run() override { test_lhs_zero (); test_rhs_zero (); diff --git a/src/test/beast/beast_abstract_clock_test.cpp b/src/test/beast/beast_abstract_clock_test.cpp index f2410e589..69b74edf3 100644 --- a/src/test/beast/beast_abstract_clock_test.cpp +++ b/src/test/beast/beast_abstract_clock_test.cpp @@ -71,7 +71,7 @@ public: pass (); } - void run () + void run () override { test ("steady_clock", get_abstract_clock< std::chrono::steady_clock>()); diff --git a/src/test/beast/beast_asio_error_test.cpp b/src/test/beast/beast_asio_error_test.cpp index 49160ffa6..4a3400ea7 100644 --- a/src/test/beast/beast_asio_error_test.cpp +++ b/src/test/beast/beast_asio_error_test.cpp @@ -26,7 +26,7 @@ namespace beast { class error_test : public unit_test::suite { public: - void run() + void run() override { { boost::system::error_code ec = diff --git a/src/test/beast/beast_basic_seconds_clock_test.cpp b/src/test/beast/beast_basic_seconds_clock_test.cpp index 7a439aecd..5b716f36a 100644 --- a/src/test/beast/beast_basic_seconds_clock_test.cpp +++ b/src/test/beast/beast_basic_seconds_clock_test.cpp @@ -27,7 +27,7 @@ class basic_seconds_clock_test : public unit_test::suite { public: void - run() + run() override { basic_seconds_clock < std::chrono::steady_clock>::now (); diff --git a/src/test/beast/beast_weak_fn_test.cpp b/src/test/beast/beast_weak_fn_test.cpp index 97ad8b361..d913f7e68 100644 --- a/src/test/beast/beast_weak_fn_test.cpp +++ b/src/test/beast/beast_weak_fn_test.cpp @@ -62,7 +62,7 @@ public: }; void - run() + run() override { { bool called = false; diff --git a/src/test/beast/define_print.cpp b/src/test/beast/define_print.cpp index 4499fb0d9..cb45a77cf 100644 --- a/src/test/beast/define_print.cpp +++ b/src/test/beast/define_print.cpp @@ -20,7 +20,7 @@ class print_test : public suite { public: void - run() + run() override { std::size_t manual = 0; std::size_t total = 0; diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp index 5595d553d..1c11489c2 100644 --- a/src/test/conditions/PreimageSha256_test.cpp +++ b/src/test/conditions/PreimageSha256_test.cpp @@ -179,7 +179,7 @@ class PreimageSha256_test : public beast::unit_test::suite } - void run () + void run () override { testKnownVectors(); testOtherTypes(); diff --git a/src/test/consensus/LedgerTrie_test.cpp b/src/test/consensus/LedgerTrie_test.cpp index 2708ff80d..05abf579e 100644 --- a/src/test/consensus/LedgerTrie_test.cpp +++ b/src/test/consensus/LedgerTrie_test.cpp @@ -646,7 +646,7 @@ class LedgerTrie_test : public beast::unit_test::suite } void - run() + run() override { testInsert(); testRemove(); diff --git a/src/test/core/ClosureCounter_test.cpp b/src/test/core/ClosureCounter_test.cpp index bd5612501..cb4e6596f 100644 --- a/src/test/core/ClosureCounter_test.cpp +++ b/src/test/core/ClosureCounter_test.cpp @@ -313,7 +313,7 @@ class ClosureCounter_test : public beast::unit_test::suite } public: - void run() + void run() override { testConstruction(); testArgs(); diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index 9846d274d..fd43906da 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -852,7 +852,7 @@ trustthesevalidators.gov } } - void run () + void run () override { testLegacy (); testDbPath (); diff --git a/src/test/core/Coroutine_test.cpp b/src/test/core/Coroutine_test.cpp index a6c0c436c..b015d7f61 100644 --- a/src/test/core/Coroutine_test.cpp +++ b/src/test/core/Coroutine_test.cpp @@ -170,7 +170,7 @@ public: } void - run() + run() override { correct_order(); incorrect_order(); diff --git a/src/test/core/CryptoPRNG_test.cpp b/src/test/core/CryptoPRNG_test.cpp index 3f5d22e53..c57796b4a 100644 --- a/src/test/core/CryptoPRNG_test.cpp +++ b/src/test/core/CryptoPRNG_test.cpp @@ -113,7 +113,7 @@ class CryptoPRNG_test : public beast::unit_test::suite } public: - void run () + void run () override { testGetValues(); testSaveLoad(); diff --git a/src/test/core/JobQueue_test.cpp b/src/test/core/JobQueue_test.cpp index ec8c72d53..a3eaf767d 100644 --- a/src/test/core/JobQueue_test.cpp +++ b/src/test/core/JobQueue_test.cpp @@ -140,7 +140,7 @@ class JobQueue_test : public beast::unit_test::suite } public: - void run() + void run() override { testAddJob(); testPostCoro(); diff --git a/src/test/core/SociDB_test.cpp b/src/test/core/SociDB_test.cpp index 988113cd5..f65b4058a 100644 --- a/src/test/core/SociDB_test.cpp +++ b/src/test/core/SociDB_test.cpp @@ -367,7 +367,7 @@ public: testSQLiteSelect (); testSQLiteDeleteWithSubselect(); } - void run () + void run () override { testSQLite (); } diff --git a/src/test/core/Stoppable_test.cpp b/src/test/core/Stoppable_test.cpp index 43f4d685c..f06aca772 100644 --- a/src/test/core/Stoppable_test.cpp +++ b/src/test/core/Stoppable_test.cpp @@ -187,7 +187,7 @@ class Stoppable_test , test_(test) , stop_(running) {} - ~A() + ~A() override { while (stop_ != stopped) ; @@ -446,7 +446,7 @@ class Stoppable_test }; public: - void run() + void run() override { { Root rt(*this); diff --git a/src/test/core/Workers_test.cpp b/src/test/core/Workers_test.cpp index c2ec0e15b..9fe210cbb 100644 --- a/src/test/core/Workers_test.cpp +++ b/src/test/core/Workers_test.cpp @@ -145,7 +145,7 @@ public: BEAST_EXPECT(cb.count.load() == 0); } - void run() + void run() override { testThreads( 0, 0, 0); testThreads( 1, 0, 1); diff --git a/src/test/json/json_value_test.cpp b/src/test/json/json_value_test.cpp index 67b53f32c..b20204d14 100644 --- a/src/test/json/json_value_test.cpp +++ b/src/test/json/json_value_test.cpp @@ -296,7 +296,7 @@ struct json_value_test : beast::unit_test::suite } } - void run () + void run () override { test_bool (); test_bad_json (); diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp index 63fbc788c..fbab37e8a 100644 --- a/src/test/jtx/Env_test.cpp +++ b/src/test/jtx/Env_test.cpp @@ -750,7 +750,7 @@ public: } void - run() + run() override { testAccount(); testAmount(); diff --git a/src/test/ledger/CashDiff_test.cpp b/src/test/ledger/CashDiff_test.cpp index c7a73f6d2..c9208ee0d 100644 --- a/src/test/ledger/CashDiff_test.cpp +++ b/src/test/ledger/CashDiff_test.cpp @@ -91,7 +91,7 @@ class CashDiff_test : public beast::unit_test::suite } public: - void run () + void run () override { testDust(); } diff --git a/src/test/ledger/Invariants_test.cpp b/src/test/ledger/Invariants_test.cpp index c5ff191de..9f16ec9f5 100644 --- a/src/test/ledger/Invariants_test.cpp +++ b/src/test/ledger/Invariants_test.cpp @@ -444,7 +444,7 @@ class Invariants_test : public beast::unit_test::suite } public: - void run () + void run () override { testEnabled (); diff --git a/src/test/ledger/PaymentSandbox_test.cpp b/src/test/ledger/PaymentSandbox_test.cpp index 46fd42bec..575f9be25 100644 --- a/src/test/ledger/PaymentSandbox_test.cpp +++ b/src/test/ledger/PaymentSandbox_test.cpp @@ -367,7 +367,7 @@ class PaymentSandbox_test : public beast::unit_test::suite } public: - void run () + void run () override { auto testAll = [this](FeatureBitset features) { testSelfFunding(features); diff --git a/src/test/ledger/SHAMapV2_test.cpp b/src/test/ledger/SHAMapV2_test.cpp index 259d87bc1..afab6f1d8 100644 --- a/src/test/ledger/SHAMapV2_test.cpp +++ b/src/test/ledger/SHAMapV2_test.cpp @@ -68,7 +68,7 @@ class SHAMapV2_test : public beast::unit_test::suite BEAST_EXPECT(getEnabledAmendments(*ledger) == amendments); } - void run() + void run() override { testSHAMapV2(); } diff --git a/src/test/ledger/SkipList_test.cpp b/src/test/ledger/SkipList_test.cpp index 663bb0eac..0f58ca270 100644 --- a/src/test/ledger/SkipList_test.cpp +++ b/src/test/ledger/SkipList_test.cpp @@ -101,7 +101,7 @@ class SkipList_test : public beast::unit_test::suite } } - void run() + void run() override { testSkipList(); } diff --git a/src/test/ledger/View_test.cpp b/src/test/ledger/View_test.cpp index dec4a0ab6..b47361992 100644 --- a/src/test/ledger/View_test.cpp +++ b/src/test/ledger/View_test.cpp @@ -763,7 +763,7 @@ class View_test } } - void run() + void run() override { // This had better work, or else BEAST_EXPECT(k(0).key < k(1).key); diff --git a/src/test/nodestore/Backend_test.cpp b/src/test/nodestore/Backend_test.cpp index 5e1a62f58..256e9e150 100644 --- a/src/test/nodestore/Backend_test.cpp +++ b/src/test/nodestore/Backend_test.cpp @@ -100,7 +100,7 @@ public: //-------------------------------------------------------------------------- - void run () + void run () override { std::uint64_t const seedValue = 50; diff --git a/src/test/nodestore/Basics_test.cpp b/src/test/nodestore/Basics_test.cpp index 0fcebc122..1cb50e748 100644 --- a/src/test/nodestore/Basics_test.cpp +++ b/src/test/nodestore/Basics_test.cpp @@ -76,7 +76,7 @@ public: } } - void run () + void run () override { std::uint64_t const seedValue = 50; diff --git a/src/test/nodestore/Database_test.cpp b/src/test/nodestore/Database_test.cpp index 10168f0f1..8a9b0dc52 100644 --- a/src/test/nodestore/Database_test.cpp +++ b/src/test/nodestore/Database_test.cpp @@ -211,7 +211,7 @@ public: //-------------------------------------------------------------------------- - void run () + void run () override { std::int64_t const seedValue = 50; diff --git a/src/test/overlay/TMHello_test.cpp b/src/test/overlay/TMHello_test.cpp index 32ca68074..979231d63 100644 --- a/src/test/overlay/TMHello_test.cpp +++ b/src/test/overlay/TMHello_test.cpp @@ -59,7 +59,7 @@ public: } void - run() + run() override { test_protocolVersions(); } diff --git a/src/test/peerfinder/Livecache_test.cpp b/src/test/peerfinder/Livecache_test.cpp index 6f40fe1ed..70124cd37 100644 --- a/src/test/peerfinder/Livecache_test.cpp +++ b/src/test/peerfinder/Livecache_test.cpp @@ -61,7 +61,7 @@ public: pass(); } - void run () + void run () override { testFetch (); } diff --git a/src/test/peerfinder/PeerFinder_test.cpp b/src/test/peerfinder/PeerFinder_test.cpp index 494e8173a..702ee11a4 100644 --- a/src/test/peerfinder/PeerFinder_test.cpp +++ b/src/test/peerfinder/PeerFinder_test.cpp @@ -149,7 +149,7 @@ public: BEAST_EXPECT(n <= (seconds+59)/60); } - void run () + void run () override { test_backoff1(); test_backoff2(); diff --git a/src/test/protocol/BuildInfo_test.cpp b/src/test/protocol/BuildInfo_test.cpp index cc42621cc..40840627f 100644 --- a/src/test/protocol/BuildInfo_test.cpp +++ b/src/test/protocol/BuildInfo_test.cpp @@ -84,7 +84,7 @@ public: BEAST_EXPECT(to_packed (from_version (65535, 65535)) == 4294967295); } - void run () + void run () override { testValues (); testStringVersion (); diff --git a/src/test/protocol/IOUAmount_test.cpp b/src/test/protocol/IOUAmount_test.cpp index 77fea38c0..b917238a4 100644 --- a/src/test/protocol/IOUAmount_test.cpp +++ b/src/test/protocol/IOUAmount_test.cpp @@ -246,7 +246,7 @@ public: //-------------------------------------------------------------------------- - void run () + void run () override { testZero (); testSigNum (); diff --git a/src/test/protocol/InnerObjectFormats_test.cpp b/src/test/protocol/InnerObjectFormats_test.cpp index 4a0ae6b25..42e755e69 100644 --- a/src/test/protocol/InnerObjectFormats_test.cpp +++ b/src/test/protocol/InnerObjectFormats_test.cpp @@ -171,7 +171,7 @@ static TestJSONTxt const testArray[] = class InnerObjectFormatsParsedJSON_test : public beast::unit_test::suite { public: - void run() + void run() override { using namespace InnerObjectFormatsUnitTestDetail; diff --git a/src/test/protocol/Issue_test.cpp b/src/test/protocol/Issue_test.cpp index f3ea95fe6..fdad7f630 100644 --- a/src/test/protocol/Issue_test.cpp +++ b/src/test/protocol/Issue_test.cpp @@ -456,7 +456,7 @@ public: //-------------------------------------------------------------------------- - void run() + void run() override { testcase ("Currency"); testUnsigned (); diff --git a/src/test/protocol/Quality_test.cpp b/src/test/protocol/Quality_test.cpp index 39776bda9..4ab9e24ce 100644 --- a/src/test/protocol/Quality_test.cpp +++ b/src/test/protocol/Quality_test.cpp @@ -347,7 +347,7 @@ public: BEAST_EXPECT(qa < qb); } void - run() + run() override { test_comparisons (); test_composition (); diff --git a/src/test/protocol/STAmount_test.cpp b/src/test/protocol/STAmount_test.cpp index 58f6282ab..758105325 100644 --- a/src/test/protocol/STAmount_test.cpp +++ b/src/test/protocol/STAmount_test.cpp @@ -606,7 +606,7 @@ public: //-------------------------------------------------------------------------- - void run () + void run () override { testSetValue (); testNativeCurrency (); diff --git a/src/test/protocol/STObject_test.cpp b/src/test/protocol/STObject_test.cpp index befae933a..c22141ac8 100644 --- a/src/test/protocol/STObject_test.cpp +++ b/src/test/protocol/STObject_test.cpp @@ -632,7 +632,7 @@ public: } void - run() + run() override { // Instantiate a jtx::Env so debugLog writes are exercised. test::jtx::Env env (*this); diff --git a/src/test/protocol/STTx_test.cpp b/src/test/protocol/STTx_test.cpp index 0310317ac..f9e884ad4 100644 --- a/src/test/protocol/STTx_test.cpp +++ b/src/test/protocol/STTx_test.cpp @@ -31,7 +31,7 @@ namespace ripple { class STTx_test : public beast::unit_test::suite { public: - void run() + void run() override { testcase ("overly nested transactions"); testDeepNesting(); @@ -1292,7 +1292,7 @@ public: class InnerObjectFormatsSerializer_test : public beast::unit_test::suite { public: - void run() + void run() override { auto const kp1 = randomKeyPair (KeyType::secp256k1); auto const id1 = calcAccountID(kp1.first); diff --git a/src/test/protocol/STValidation_test.cpp b/src/test/protocol/STValidation_test.cpp index 09b6410d4..04a7b7437 100644 --- a/src/test/protocol/STValidation_test.cpp +++ b/src/test/protocol/STValidation_test.cpp @@ -108,7 +108,7 @@ public: } void - run() + run() override { testDeserialization(); } diff --git a/src/test/protocol/XRPAmount_test.cpp b/src/test/protocol/XRPAmount_test.cpp index 07a9676ef..b17a57115 100644 --- a/src/test/protocol/XRPAmount_test.cpp +++ b/src/test/protocol/XRPAmount_test.cpp @@ -190,7 +190,7 @@ public: //-------------------------------------------------------------------------- - void run () + void run () override { testSigNum (); testBeastZero (); diff --git a/src/test/protocol/digest_test.cpp b/src/test/protocol/digest_test.cpp index efcf32d1d..95a41107b 100644 --- a/src/test/protocol/digest_test.cpp +++ b/src/test/protocol/digest_test.cpp @@ -148,7 +148,7 @@ public: pass (); } - void run () + void run () override { testSHA512 (); testSHA256 (); diff --git a/src/test/resource/Logic_test.cpp b/src/test/resource/Logic_test.cpp index 0efbd97e6..6d6b4ccaa 100644 --- a/src/test/resource/Logic_test.cpp +++ b/src/test/resource/Logic_test.cpp @@ -243,7 +243,7 @@ public: pass(); } - void run() + void run() override { beast::Journal j; diff --git a/src/test/rpc/AccountCurrencies_test.cpp b/src/test/rpc/AccountCurrencies_test.cpp index 101d47cfd..be431dc71 100644 --- a/src/test/rpc/AccountCurrencies_test.cpp +++ b/src/test/rpc/AccountCurrencies_test.cpp @@ -184,7 +184,7 @@ class AccountCurrencies_test : public beast::unit_test::suite } public: - void run () + void run () override { testBadInput (); testBasic (); diff --git a/src/test/rpc/AccountInfo_test.cpp b/src/test/rpc/AccountInfo_test.cpp index a430cf92a..ab5319a9e 100644 --- a/src/test/rpc/AccountInfo_test.cpp +++ b/src/test/rpc/AccountInfo_test.cpp @@ -314,7 +314,7 @@ public: } } - void run() + void run() override { testErrors(); testSignerLists(); diff --git a/src/test/rpc/AccountLinesRPC_test.cpp b/src/test/rpc/AccountLinesRPC_test.cpp index 1c59b6a25..c9bdb708c 100644 --- a/src/test/rpc/AccountLinesRPC_test.cpp +++ b/src/test/rpc/AccountLinesRPC_test.cpp @@ -863,7 +863,7 @@ public: BEAST_EXPECT(linesEnd.isMember(jss::id) && linesEnd[jss::id] == 5); } - void run () + void run () override { testAccountLines(); testAccountLineDelete(); diff --git a/src/test/rpc/AccountOffers_test.cpp b/src/test/rpc/AccountOffers_test.cpp index 639e17809..7e2f6761c 100644 --- a/src/test/rpc/AccountOffers_test.cpp +++ b/src/test/rpc/AccountOffers_test.cpp @@ -267,7 +267,7 @@ public: } - void run() + void run() override { testSequential(true); testSequential(false); diff --git a/src/test/rpc/AccountSet_test.cpp b/src/test/rpc/AccountSet_test.cpp index a524967f5..6beace52a 100644 --- a/src/test/rpc/AccountSet_test.cpp +++ b/src/test/rpc/AccountSet_test.cpp @@ -438,7 +438,7 @@ public: env(fset (alice, asfRequireAuth), ter(tecOWNERS)); } - void run() + void run() override { testNullAccountSet(); testMostFlags(); diff --git a/src/test/rpc/AccountTx_test.cpp b/src/test/rpc/AccountTx_test.cpp index cdab8ee7d..89640c3de 100644 --- a/src/test/rpc/AccountTx_test.cpp +++ b/src/test/rpc/AccountTx_test.cpp @@ -166,7 +166,7 @@ class AccountTX_test : public beast::unit_test::suite public: void - run() + run() override { testParameters(); } diff --git a/src/test/rpc/AmendmentBlocked_test.cpp b/src/test/rpc/AmendmentBlocked_test.cpp index b6ba0a9ea..2cc61c9d8 100644 --- a/src/test/rpc/AmendmentBlocked_test.cpp +++ b/src/test/rpc/AmendmentBlocked_test.cpp @@ -157,7 +157,7 @@ class AmendmentBlocked_test : public beast::unit_test::suite } public: - void run() + void run() override { testBlockedMethods(); } diff --git a/src/test/rpc/DepositAuthorized_test.cpp b/src/test/rpc/DepositAuthorized_test.cpp index 9117d94c6..85f2853cf 100644 --- a/src/test/rpc/DepositAuthorized_test.cpp +++ b/src/test/rpc/DepositAuthorized_test.cpp @@ -216,7 +216,7 @@ public: } } - void run() + void run() override { testValid(); testErrors(); diff --git a/src/test/rpc/GetCounts_test.cpp b/src/test/rpc/GetCounts_test.cpp index c7abadf1d..0f0f89a73 100644 --- a/src/test/rpc/GetCounts_test.cpp +++ b/src/test/rpc/GetCounts_test.cpp @@ -106,7 +106,7 @@ class GetCounts_test : public beast::unit_test::suite } public: - void run () + void run () override { testGetCounts(); } diff --git a/src/test/rpc/JSONRPC_test.cpp b/src/test/rpc/JSONRPC_test.cpp index 52c26732f..aaf363d9d 100644 --- a/src/test/rpc/JSONRPC_test.cpp +++ b/src/test/rpc/JSONRPC_test.cpp @@ -2353,7 +2353,7 @@ public: } } - void run () + void run () override { testBadRpcCommand (); testAutoFillFees (); diff --git a/src/test/rpc/KeyGeneration_test.cpp b/src/test/rpc/KeyGeneration_test.cpp index 8e0ba7b6b..7fd59dea2 100644 --- a/src/test/rpc/KeyGeneration_test.cpp +++ b/src/test/rpc/KeyGeneration_test.cpp @@ -709,7 +709,7 @@ public: } } - void run() + void run() override { testKeyType (boost::none, secp256k1_strings); testKeyType (std::string("secp256k1"), secp256k1_strings); diff --git a/src/test/rpc/LedgerClosed_test.cpp b/src/test/rpc/LedgerClosed_test.cpp index 3066233ca..2fbf5ff22 100644 --- a/src/test/rpc/LedgerClosed_test.cpp +++ b/src/test/rpc/LedgerClosed_test.cpp @@ -52,7 +52,7 @@ public: BEAST_EXPECT(lc_result[jss::ledger_index] == 3); } - void run() + void run() override { testMonitorRoot(); } diff --git a/src/test/rpc/LedgerData_test.cpp b/src/test/rpc/LedgerData_test.cpp index 3ccfc0357..97b060795 100644 --- a/src/test/rpc/LedgerData_test.cpp +++ b/src/test/rpc/LedgerData_test.cpp @@ -436,7 +436,7 @@ public: } } - void run() + void run() override { testCurrentLedgerToLimits(true); testCurrentLedgerToLimits(false); diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index 091a84e66..e874a6b1f 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -1500,7 +1500,7 @@ class LedgerRPC_test : public beast::unit_test::suite } public: - void run () + void run () override { testLedgerRequest(); testBadInput(); diff --git a/src/test/rpc/LedgerRequestRPC_test.cpp b/src/test/rpc/LedgerRequestRPC_test.cpp index 990d3c1ab..c3e996585 100644 --- a/src/test/rpc/LedgerRequestRPC_test.cpp +++ b/src/test/rpc/LedgerRequestRPC_test.cpp @@ -291,7 +291,7 @@ public: } - void run () + void run () override { testLedgerRequest(); testEvolution(); diff --git a/src/test/rpc/NoRippleCheck_test.cpp b/src/test/rpc/NoRippleCheck_test.cpp index 8bb569281..5c367c6e8 100644 --- a/src/test/rpc/NoRippleCheck_test.cpp +++ b/src/test/rpc/NoRippleCheck_test.cpp @@ -227,7 +227,7 @@ class NoRippleCheck_test : public beast::unit_test::suite } public: - void run () + void run () override { testBadInput (); for (auto user : {true, false}) @@ -327,7 +327,7 @@ class NoRippleCheckLimits_test : public beast::unit_test::suite } public: - void run () + void run () override { for (auto admin : {true, false}) testLimits (admin); diff --git a/src/test/rpc/NoRipple_test.cpp b/src/test/rpc/NoRipple_test.cpp index 84a3566e2..0ebf1ad3c 100644 --- a/src/test/rpc/NoRipple_test.cpp +++ b/src/test/rpc/NoRipple_test.cpp @@ -208,7 +208,7 @@ public: } } - void run () + void run () override { testSetAndClear(); diff --git a/src/test/rpc/OwnerInfo_test.cpp b/src/test/rpc/OwnerInfo_test.cpp index 49b44178b..67b16c3de 100644 --- a/src/test/rpc/OwnerInfo_test.cpp +++ b/src/test/rpc/OwnerInfo_test.cpp @@ -201,7 +201,7 @@ class OwnerInfo_test : public beast::unit_test::suite } public: - void run () + void run () override { testBadInput (); testBasic (); diff --git a/src/test/rpc/Peers_test.cpp b/src/test/rpc/Peers_test.cpp index cd97d8eca..d8f0a2beb 100644 --- a/src/test/rpc/Peers_test.cpp +++ b/src/test/rpc/Peers_test.cpp @@ -85,7 +85,7 @@ class Peers_test : public beast::unit_test::suite } public: - void run () + void run () override { testRequest(); } diff --git a/src/test/rpc/ServerInfo_test.cpp b/src/test/rpc/ServerInfo_test.cpp index c9130f9f7..6cdea3e3e 100644 --- a/src/test/rpc/ServerInfo_test.cpp +++ b/src/test/rpc/ServerInfo_test.cpp @@ -88,7 +88,7 @@ public: } } - void run () + void run () override { testServerInfo (); } diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp index 5272efac5..a02691637 100644 --- a/src/test/rpc/Status_test.cpp +++ b/src/test/rpc/Status_test.cpp @@ -83,7 +83,7 @@ private: } public: - void run() + void run() override { test_OK (); test_error (); @@ -200,7 +200,7 @@ private: } public: - void run() + void run() override { test_OK (); test_error (); diff --git a/src/test/rpc/TransactionEntry_test.cpp b/src/test/rpc/TransactionEntry_test.cpp index 142d23fad..0b009fc7e 100644 --- a/src/test/rpc/TransactionEntry_test.cpp +++ b/src/test/rpc/TransactionEntry_test.cpp @@ -242,7 +242,7 @@ class TransactionEntry_test : public beast::unit_test::suite } public: - void run () + void run () override { testBadInput(); testRequest(); diff --git a/src/test/rpc/TransactionHistory_test.cpp b/src/test/rpc/TransactionHistory_test.cpp index 78326cbf8..2d592d1f0 100644 --- a/src/test/rpc/TransactionHistory_test.cpp +++ b/src/test/rpc/TransactionHistory_test.cpp @@ -142,7 +142,7 @@ class TransactionHistory_test : public beast::unit_test::suite } public: - void run () + void run () override { testBadInput(); testRequest(); diff --git a/src/test/rpc/ValidatorRPC_test.cpp b/src/test/rpc/ValidatorRPC_test.cpp index 74ec0b15d..4966bd8f0 100644 --- a/src/test/rpc/ValidatorRPC_test.cpp +++ b/src/test/rpc/ValidatorRPC_test.cpp @@ -399,7 +399,7 @@ public: } void - run() + run() override { testPrivileges(); testStaticUNL(); diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index 656dbea28..33be5b655 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -1013,7 +1013,7 @@ class ServerStatus_test : public: void - run() + run() override { for (auto it : {"http", "ws", "ws2"}) { diff --git a/src/test/server/Server_test.cpp b/src/test/server/Server_test.cpp index c9f1189f3..c2857c200 100644 --- a/src/test/server/Server_test.cpp +++ b/src/test/server/Server_test.cpp @@ -538,7 +538,7 @@ public: } void - run() + run() override { basicTests(); stressTest(); diff --git a/src/test/shamap/FetchPack_test.cpp b/src/test/shamap/FetchPack_test.cpp index c1ef616e2..7131fba2d 100644 --- a/src/test/shamap/FetchPack_test.cpp +++ b/src/test/shamap/FetchPack_test.cpp @@ -114,7 +114,7 @@ public: map.emplace (hash, blob); } - void run () + void run () override { beast::Journal const j; // debug journal TestFamily f(j); diff --git a/src/test/shamap/SHAMapSync_test.cpp b/src/test/shamap/SHAMapSync_test.cpp index 174bc060d..b4be4ced7 100644 --- a/src/test/shamap/SHAMapSync_test.cpp +++ b/src/test/shamap/SHAMapSync_test.cpp @@ -84,7 +84,7 @@ public: return true; } - void run() + void run() override { log << "Run, version 1\n" << std::endl; run(SHAMap::version{1}); diff --git a/src/test/shamap/SHAMap_test.cpp b/src/test/shamap/SHAMap_test.cpp index 516e2b0d2..66549ed5a 100644 --- a/src/test/shamap/SHAMap_test.cpp +++ b/src/test/shamap/SHAMap_test.cpp @@ -117,7 +117,7 @@ public: return vuc; } - void run () + void run () override { run (true, SHAMap::version{1}); run (false, SHAMap::version{1});