From 8ea1598a13e2344a8733ffe2c79abacfe7f477f4 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Tue, 7 Jun 2011 21:33:46 +0000 Subject: QPID-3284: Eliminated warnings from gcc 4.6 compiler - Removed a bunch of variables set but not further used. - Rejigged some asserts which would now have unused vars if compiler -DNDEBUG git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1133166 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/QueueFlowLimit.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cpp/src/qpid/broker/QueueFlowLimit.cpp') diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/cpp/src/qpid/broker/QueueFlowLimit.cpp index b2e2e54bdf..fcf8d089f9 100644 --- a/cpp/src/qpid/broker/QueueFlowLimit.cpp +++ b/cpp/src/qpid/broker/QueueFlowLimit.cpp @@ -167,7 +167,8 @@ void QueueFlowLimit::enqueued(const QueuedMessage& msg) msg.payload->getIngressCompletion().startCompleter(); // don't complete until flow resumes bool unique; unique = index.insert(std::pair >(msg.position, msg.payload)).second; - assert(unique); + // Like this to avoid tripping up unused variable warning when NDEBUG set + if (!unique) assert(unique); } } @@ -379,7 +380,8 @@ void QueueFlowLimit::setState(const qpid::framing::FieldTable& state) QueuedMessage msg(queue->find(seq)); // fyi: msg.payload may be null if msg is delivered & unacked bool unique; unique = index.insert(std::pair >(seq, msg.payload)).second; - assert(unique); + // Like this to avoid tripping up unused variable warning when NDEBUG set + if (!unique) assert(unique); } } } -- cgit v1.2.1