From 04f13888608535c4d0fe47cffed53c33b0a33b69 Mon Sep 17 00:00:00 2001 From: Joe Loser Date: Fri, 4 May 2018 08:39:31 -0400 Subject: [PATCH] Remove extra semicolons: Several functions had an extra semicolon. This removes them. --- src/ripple/app/misc/Manifest.h | 2 +- src/ripple/app/misc/ValidatorList.h | 2 +- src/ripple/app/paths/impl/BookStep.cpp | 2 +- src/ripple/app/paths/impl/XRPEndpointStep.cpp | 2 +- src/ripple/app/tx/impl/OfferStream.h | 4 ++-- src/ripple/consensus/LedgerTrie.h | 2 +- src/ripple/ledger/ApplyView.h | 2 +- src/ripple/overlay/impl/OverlayImpl.h | 2 +- src/ripple/peerfinder/impl/Counts.h | 2 +- src/ripple/protocol/STPathSet.h | 7 ++++--- src/test/app/AmendmentTable_test.cpp | 2 +- src/test/app/DepositAuth_test.cpp | 2 +- src/test/app/Offer_test.cpp | 8 ++++---- src/test/app/TrustAndBalance_test.cpp | 2 +- src/test/beast/aged_associative_container_test.cpp | 4 ++-- src/test/core/Config_test.cpp | 2 +- src/test/csf/timers.h | 4 ++-- src/test/jtx/PathSet.h | 4 ++-- src/test/rpc/Book_test.cpp | 2 +- src/test/rpc/LedgerRPC_test.cpp | 2 +- src/test/server/ServerStatus_test.cpp | 6 +++--- 21 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/ripple/app/misc/Manifest.h b/src/ripple/app/misc/Manifest.h index ad5e6a6d5e..a13a244c91 100644 --- a/src/ripple/app/misc/Manifest.h +++ b/src/ripple/app/misc/Manifest.h @@ -176,7 +176,7 @@ public: ManifestCache (beast::Journal j = beast::Journal()) : j_ (j) { - }; + } /** Returns master key's current signing key. diff --git a/src/ripple/app/misc/ValidatorList.h b/src/ripple/app/misc/ValidatorList.h index d66db9ee4e..1bc70b9769 100644 --- a/src/ripple/app/misc/ValidatorList.h +++ b/src/ripple/app/misc/ValidatorList.h @@ -249,7 +249,7 @@ public: quorum () const { return quorum_; - }; + } /** Returns `true` if public key is trusted diff --git a/src/ripple/app/paths/impl/BookStep.cpp b/src/ripple/app/paths/impl/BookStep.cpp index b6cae83c9d..ac9c161d93 100644 --- a/src/ripple/app/paths/impl/BookStep.cpp +++ b/src/ripple/app/paths/impl/BookStep.cpp @@ -80,7 +80,7 @@ public: Book const& book() const { return book_; - }; + } boost::optional cachedIn () const override diff --git a/src/ripple/app/paths/impl/XRPEndpointStep.cpp b/src/ripple/app/paths/impl/XRPEndpointStep.cpp index e5629d5fde..bcff388d0c 100644 --- a/src/ripple/app/paths/impl/XRPEndpointStep.cpp +++ b/src/ripple/app/paths/impl/XRPEndpointStep.cpp @@ -67,7 +67,7 @@ public: AccountID const& acc () const { return acc_; - }; + } boost::optional> directStepAccts () const override diff --git a/src/ripple/app/tx/impl/OfferStream.h b/src/ripple/app/tx/impl/OfferStream.h index a1dd2fa954..95e61aecff 100644 --- a/src/ripple/app/tx/impl/OfferStream.h +++ b/src/ripple/app/tx/impl/OfferStream.h @@ -65,7 +65,7 @@ public: std::uint32_t count() const { return count_; - }; + } }; protected: @@ -181,7 +181,7 @@ public: boost::container::flat_set const& permToRemove () const { return permToRemove_; - }; + } }; } diff --git a/src/ripple/consensus/LedgerTrie.h b/src/ripple/consensus/LedgerTrie.h index a80c0471d3..e914aa989a 100644 --- a/src/ripple/consensus/LedgerTrie.h +++ b/src/ripple/consensus/LedgerTrie.h @@ -160,7 +160,7 @@ private: clamp(Seq val) const { return std::min(std::max(start_, val), end_); - }; + } // Return a span of this over the half-open interval [from,to) boost::optional diff --git a/src/ripple/ledger/ApplyView.h b/src/ripple/ledger/ApplyView.h index c2d740bec7..7ec85f48a5 100644 --- a/src/ripple/ledger/ApplyView.h +++ b/src/ripple/ledger/ApplyView.h @@ -224,7 +224,7 @@ public: virtual void adjustOwnerCountHook (AccountID const& account, std::uint32_t cur, std::uint32_t next) - {}; + {} /** Append an entry to a directory diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h index 81b518fcc4..c8a04faa11 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/ripple/overlay/impl/OverlayImpl.h @@ -338,7 +338,7 @@ public: getPeerDisconnectCharges() const override { return peerDisconnectsCharges_; - }; + } private: std::shared_ptr diff --git a/src/ripple/peerfinder/impl/Counts.h b/src/ripple/peerfinder/impl/Counts.h index e980d6770a..133eb77901 100644 --- a/src/ripple/peerfinder/impl/Counts.h +++ b/src/ripple/peerfinder/impl/Counts.h @@ -92,7 +92,7 @@ public: std::size_t attempts () const { return m_attempts; - }; + } /** Returns the total number of outbound slots. */ int out_max () const diff --git a/src/ripple/protocol/STPathSet.h b/src/ripple/protocol/STPathSet.h index caf80b3cc0..70b7911144 100644 --- a/src/ripple/protocol/STPathSet.h +++ b/src/ripple/protocol/STPathSet.h @@ -142,18 +142,19 @@ public: hasIssuer () const { return getNodeType () & STPathElement::typeIssuer; - }; + } + bool hasCurrency () const { return getNodeType () & STPathElement::typeCurrency; - }; + } bool isNone () const { return getNodeType () == STPathElement::typeNone; - }; + } // Nodes are either an account ID or a offer prefix. Offer prefixs denote a // class of offers. diff --git a/src/test/app/AmendmentTable_test.cpp b/src/test/app/AmendmentTable_test.cpp index 5b801a6e19..1ca523ef03 100644 --- a/src/test/app/AmendmentTable_test.cpp +++ b/src/test/app/AmendmentTable_test.cpp @@ -122,7 +122,7 @@ public: makeSection (m_set1), makeSection (m_set2), makeSection (m_set3)); - }; + } void testConstruct () { diff --git a/src/test/app/DepositAuth_test.cpp b/src/test/app/DepositAuth_test.cpp index 5db10bd167..fab30dd86a 100644 --- a/src/test/app/DepositAuth_test.cpp +++ b/src/test/app/DepositAuth_test.cpp @@ -45,7 +45,7 @@ struct DepositAuth_test : public beast::unit_test::suite static bool hasDepositAuth (jtx::Env const& env, jtx::Account const& acct) { return ((*env.le(acct))[sfFlags] & lsfDepositAuth) == lsfDepositAuth; - }; + } void testEnable() diff --git a/src/test/app/Offer_test.cpp b/src/test/app/Offer_test.cpp index bd30abc9d9..a61bf7923a 100644 --- a/src/test/app/Offer_test.cpp +++ b/src/test/app/Offer_test.cpp @@ -46,7 +46,7 @@ class Offer_test : public beast::unit_test::suite using namespace jtx; auto feeDrops = env.current()->fees().base; return drops (dropsPerXRP::value * xrpAmount - feeDrops); - }; + } static auto ledgerEntryState(jtx::Env & env, jtx::Account const& acct_a, @@ -60,7 +60,7 @@ class Offer_test : public beast::unit_test::suite jvParams[jss::ripple_state][jss::accounts].append(acct_b.human()); return env.rpc ("json", "ledger_entry", to_string(jvParams))[jss::result]; - }; + } static auto ledgerEntryRoot (jtx::Env & env, jtx::Account const& acct) @@ -70,7 +70,7 @@ class Offer_test : public beast::unit_test::suite jvParams[jss::account_root] = acct.human(); return env.rpc ("json", "ledger_entry", to_string(jvParams))[jss::result]; - }; + } static auto ledgerEntryOffer (jtx::Env & env, @@ -81,7 +81,7 @@ class Offer_test : public beast::unit_test::suite jvParams[jss::offer][jss::seq] = offer_seq; return env.rpc ("json", "ledger_entry", to_string(jvParams))[jss::result]; - }; + } static auto getBookOffers(jtx::Env & env, diff --git a/src/test/app/TrustAndBalance_test.cpp b/src/test/app/TrustAndBalance_test.cpp index 7c5cb761ff..b07db538e2 100644 --- a/src/test/app/TrustAndBalance_test.cpp +++ b/src/test/app/TrustAndBalance_test.cpp @@ -42,7 +42,7 @@ class TrustAndBalance_test : public beast::unit_test::suite jvParams[jss::ripple_state][jss::accounts].append(acct_a.human()); jvParams[jss::ripple_state][jss::accounts].append(acct_b.human()); return env.rpc ("json", "ledger_entry", to_string(jvParams))[jss::result]; - }; + } void testPayNonexistent (FeatureBitset features) diff --git a/src/test/beast/aged_associative_container_test.cpp b/src/test/beast/aged_associative_container_test.cpp index 0f6e5fe332..de5a2cab7e 100644 --- a/src/test/beast/aged_associative_container_test.cpp +++ b/src/test/beast/aged_associative_container_test.cpp @@ -252,7 +252,7 @@ public: "orange", }; return v; - }; + } protected: static std::string name_map_part() @@ -285,7 +285,7 @@ public: std::make_pair ("orange", 5) }; return v; - }; + } protected: static std::string name_map_part() diff --git a/src/test/core/Config_test.cpp b/src/test/core/Config_test.cpp index 54a4f409e7..9846d274d8 100644 --- a/src/test/core/Config_test.cpp +++ b/src/test/core/Config_test.cpp @@ -140,7 +140,7 @@ protected: else test_.log << "Expected " << toRm.string () << " to be an empty existing directory." << std::endl; - }; + } public: ConfigGuard (beast::unit_test::suite& test, path subDir, diff --git a/src/test/csf/timers.h b/src/test/csf/timers.h index ab9784400c..cf4ce7a39a 100644 --- a/src/test/csf/timers.h +++ b/src/test/csf/timers.h @@ -52,13 +52,13 @@ public: startRealTime_{RealClock::now()}, startSimTime_{sched.now()} { - }; + } void start() { scheduler_.in(interval_, [this](){beat(scheduler_.now());}); - }; + } void beat(SimTime when) diff --git a/src/test/jtx/PathSet.h b/src/test/jtx/PathSet.h index d879487f7e..d091931850 100644 --- a/src/test/jtx/PathSet.h +++ b/src/test/jtx/PathSet.h @@ -69,7 +69,7 @@ public: Path& push_back (STPathElement const& pe); Json::Value json () const; private: - Path& addHelper (){return *this;}; + Path& addHelper (){return *this;} template Path& addHelper (First&& first, Rest&&... rest); }; @@ -133,7 +133,7 @@ private: PathSet& addHelper () { return *this; - }; + } template PathSet& addHelper (First first, Rest... rest) { diff --git a/src/test/rpc/Book_test.cpp b/src/test/rpc/Book_test.cpp index 985c4d75a4..721deddc92 100644 --- a/src/test/rpc/Book_test.cpp +++ b/src/test/rpc/Book_test.cpp @@ -1094,7 +1094,7 @@ public: return false; // Make sure no other message is waiting return wsc->getMsg(timeout) == boost::none; - }; + } void testCrossingSingleBookOffer() diff --git a/src/test/rpc/LedgerRPC_test.cpp b/src/test/rpc/LedgerRPC_test.cpp index 4a512e58db..472d896b11 100644 --- a/src/test/rpc/LedgerRPC_test.cpp +++ b/src/test/rpc/LedgerRPC_test.cpp @@ -46,7 +46,7 @@ class LedgerRPC_test : public beast::unit_test::suite } else if (BEAST_EXPECT(jv.isMember(jss::error_message))) BEAST_EXPECT(jv[jss::error_message] == msg); - }; + } // Corrupt a valid address by replacing the 10th character with '!'. // '!' is not part of the ripple alphabet. diff --git a/src/test/server/ServerStatus_test.cpp b/src/test/server/ServerStatus_test.cpp index 8a65547eec..f27c70a57e 100644 --- a/src/test/server/ServerStatus_test.cpp +++ b/src/test/server/ServerStatus_test.cpp @@ -432,7 +432,7 @@ class ServerStatus_test : return; BEAST_EXPECT(resp.result() == beast::http::status::ok); } - }; + } void testTruncatedWSUpgrade(boost::asio::yield_context& yield) @@ -481,7 +481,7 @@ class ServerStatus_test : // keep trying to read until it gives up (by timeout) async_read(sock, sb, resp, yield[ec]); BEAST_EXPECT(ec); - }; + } void testCantConnect( @@ -1049,7 +1049,7 @@ public: testStatusNotOkay (yield); }); - }; + } }; BEAST_DEFINE_TESTSUITE(ServerStatus, server, ripple);