From 0f71b4a3784fdb8f0d043232c58182be2968f77a Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Wed, 1 Oct 2014 16:44:00 -0400 Subject: [PATCH] Fix most compilation warnings for gcc, clang, release, debug. --- src/ripple/app/ledger/LedgerEntrySet.cpp | 5 +++-- src/ripple/app/paths/cursor/Liquidity.cpp | 2 +- src/ripple/app/shamap/RadixMapTest.cpp | 1 + src/ripple/app/websocket/WSServerHandler.h | 1 + src/ripple/core/JobTypes.h | 7 ++++--- src/ripple/core/impl/JobQueue.cpp | 1 + src/ripple/http/impl/ServerImpl.cpp | 4 ++-- src/ripple/overlay/impl/OverlayImpl.cpp | 4 ++++ src/ripple/peerfinder/impl/Logic.h | 1 + 9 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/ripple/app/ledger/LedgerEntrySet.cpp b/src/ripple/app/ledger/LedgerEntrySet.cpp index b9497f566..6843fd42b 100644 --- a/src/ripple/app/ledger/LedgerEntrySet.cpp +++ b/src/ripple/app/ledger/LedgerEntrySet.cpp @@ -1045,7 +1045,7 @@ void LedgerEntrySet::incrementOwnerCount (SLE::ref sleAccount) void LedgerEntrySet::incrementOwnerCount (Account const& owner) { - incrementOwnerCount(entryCache (ltACCOUNT_ROOT, + incrementOwnerCount(entryCache (ltACCOUNT_ROOT, Ledger::getAccountRootIndex (owner))); } @@ -1069,7 +1069,7 @@ void LedgerEntrySet::decrementOwnerCount (SLE::ref sleAccount) void LedgerEntrySet::decrementOwnerCount (Account const& owner) { - decrementOwnerCount(entryCache (ltACCOUNT_ROOT, + decrementOwnerCount(entryCache (ltACCOUNT_ROOT, Ledger::getAccountRootIndex (owner))); } @@ -1440,6 +1440,7 @@ TER LedgerEntrySet::rippleCredit ( // Make sure issuer is involved. assert ( !bCheckIssuer || uSenderID == issuer || uReceiverID == issuer); + (void) issuer; // Disallow sending to self. assert (uSenderID != uReceiverID); diff --git a/src/ripple/app/paths/cursor/Liquidity.cpp b/src/ripple/app/paths/cursor/Liquidity.cpp index 4abfefbd8..7fa558c2a 100644 --- a/src/ripple/app/paths/cursor/Liquidity.cpp +++ b/src/ripple/app/paths/cursor/Liquidity.cpp @@ -26,7 +26,7 @@ namespace path { TER PathCursor::liquidity (LedgerEntrySet const& lesCheckpoint) const { - TER resultCode; + TER resultCode = tecPATH_DRY; PathCursor pc = *this; ledger() = lesCheckpoint.duplicate (); diff --git a/src/ripple/app/shamap/RadixMapTest.cpp b/src/ripple/app/shamap/RadixMapTest.cpp index dd1b79516..5fbd792ff 100644 --- a/src/ripple/app/shamap/RadixMapTest.cpp +++ b/src/ripple/app/shamap/RadixMapTest.cpp @@ -41,6 +41,7 @@ void add_random_items (std::size_t n, Table& t, beast::Random& r) make_random_item (r)); auto const result (t.addItem (*item, false, false)); assert (result); + (void) result; } } diff --git a/src/ripple/app/websocket/WSServerHandler.h b/src/ripple/app/websocket/WSServerHandler.h index 2c7094195..56e72fc50 100644 --- a/src/ripple/app/websocket/WSServerHandler.h +++ b/src/ripple/app/websocket/WSServerHandler.h @@ -202,6 +202,7 @@ public: std::make_shared < WSConnectionType > (std::ref(m_resourceManager), std::ref (m_source), std::ref(*this), std::cref(cpClient)))); assert (result.second); + (void) result.second; WriteLog (lsDEBUG, WSServerHandlerLog) << "Ws:: on_open(" << cpClient->get_socket ().remote_endpoint ().to_string () << ")"; } diff --git a/src/ripple/core/JobTypes.h b/src/ripple/core/JobTypes.h index 95e9c1dd7..decd09632 100644 --- a/src/ripple/core/JobTypes.h +++ b/src/ripple/core/JobTypes.h @@ -36,7 +36,7 @@ public: JobTypes () : m_unknown (jtINVALID, "invalid", 0, true, true, 0, 0) - { + { int maxLimit = std::numeric_limits ::max (); // Make a fetch pack for a peer @@ -209,18 +209,19 @@ public: } private: - void add(JobType jt, std::string name, int limit, + void add(JobType jt, std::string name, int limit, bool skip, bool special, std::uint64_t avgLatency, std::uint64_t peakLatency) { assert (m_map.find (jt) == m_map.end ()); std::pair result (m_map.emplace ( std::piecewise_construct, - std::forward_as_tuple (jt), + std::forward_as_tuple (jt), std::forward_as_tuple (jt, name, limit, skip, special, avgLatency, peakLatency))); assert (result.second == true); + (void) result.second; } JobTypeInfo m_unknown; diff --git a/src/ripple/core/impl/JobQueue.cpp b/src/ripple/core/impl/JobQueue.cpp index cb667f489..9f18b8966 100644 --- a/src/ripple/core/impl/JobQueue.cpp +++ b/src/ripple/core/impl/JobQueue.cpp @@ -96,6 +96,7 @@ public: std::forward_as_tuple (jt.type ()), std::forward_as_tuple (jt, m_collector))); assert (result.second == true); + (void) result.second; } } } diff --git a/src/ripple/http/impl/ServerImpl.cpp b/src/ripple/http/impl/ServerImpl.cpp index f4541a130..66c282677 100644 --- a/src/ripple/http/impl/ServerImpl.cpp +++ b/src/ripple/http/impl/ServerImpl.cpp @@ -269,9 +269,9 @@ ServerImpl::on_update () for (Ports::const_iterator port (ports.begin()); port != ports.end(); ++port) { - int comp; + int comp = 0; - while (door != m_doors.end() && + while (door != m_doors.end() && ((comp = compare (*port, (*door)->port())) > 0)) { (*door)->cancel(); diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp index e8c0b6b39..f07962102 100644 --- a/src/ripple/overlay/impl/OverlayImpl.cpp +++ b/src/ripple/overlay/impl/OverlayImpl.cpp @@ -127,6 +127,7 @@ OverlayImpl::accept (bool proxyHandshake, socket_type&& socket) std::pair const result ( m_peers.emplace (slot, peer)); assert (result.second); + (void) result.second; } ++m_child_count; @@ -166,6 +167,7 @@ OverlayImpl::connect (beast::IP::Endpoint const& remote_endpoint) std::pair const result ( m_peers.emplace (slot, peer)); assert (result.second); + (void) result.second; } ++m_child_count; @@ -476,6 +478,7 @@ OverlayImpl::onPeerActivated (Peer::ptr const& peer) std::make_tuple (peer->getShortId()), std::make_tuple (peer))); assert(result.second); + (void) result.second; } { @@ -484,6 +487,7 @@ OverlayImpl::onPeerActivated (Peer::ptr const& peer) std::make_tuple (peer->getNodePublic()), std::make_tuple (peer))); assert(result.second); + (void) result.second; } m_journal.debug << diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h index c163228ea..b65150b4b 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/ripple/peerfinder/impl/Logic.h @@ -454,6 +454,7 @@ public: state->keys.insert (key)); // Public key must not already exist assert (result.second); + (void) result.second; // Change state and update counts state->counts.remove (*slot);