You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2012/07/24 21:18:14 UTC
svn commit: r1365234 - in /qpid/trunk/qpid/cpp/src/qpid:
amqp_0_10/Codecs.cpp broker/LinkRegistry.cpp broker/MessageMap.cpp
Author: aconway
Date: Tue Jul 24 19:18:14 2012
New Revision: 1365234
URL: http://svn.apache.org/viewvc?rev=1365234&view=rev
Log:
QPID-4165: Fix unsused variable warnings when compiling with -DNDEBUG
Modified:
qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/MessageMap.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp?rev=1365234&r1=1365233&r2=1365234&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp Tue Jul 24 19:18:14 2012
@@ -406,7 +406,7 @@ void encode(const Variant::Map& map, uin
buffer.putShortString(i->first);
encode(i->second, buffer);
}
- assert(s + len == buffer.getPosition());
+ (void) s; assert(s + len == buffer.getPosition());
}
void encode(const Variant::Map& map, const std::string& efield, const Variant& evalue, uint32_t len, qpid::framing::Buffer& buffer)
@@ -421,7 +421,7 @@ void encode(const Variant::Map& map, con
buffer.putShortString(efield);
encode(evalue, buffer);
- assert(s + len == buffer.getPosition());
+ (void) s; assert(s + len == buffer.getPosition());
}
void encode(const Variant::List& list, uint32_t len, qpid::framing::Buffer& buffer)
@@ -432,7 +432,7 @@ void encode(const Variant::List& list, u
for (Variant::List::const_iterator i = list.begin(); i != list.end(); ++i) {
encode(*i, buffer);
}
- assert(s + len == buffer.getPosition());
+ (void) s; assert(s + len == buffer.getPosition());
}
void decode(qpid::framing::Buffer&, Variant::Map&)
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp?rev=1365234&r1=1365233&r2=1365234&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Tue Jul 24 19:18:14 2012
@@ -317,7 +317,7 @@ void LinkRegistry::notifyConnection(cons
// create a mapping from connection id to link
QPID_LOG(debug, "LinkRegistry::notifyConnection(); key=" << key );
std::string host;
- uint16_t port;
+ uint16_t port = 0;
extractHostPort( key, &host, &port );
Link::shared_ptr link;
{
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageMap.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageMap.cpp?rev=1365234&r1=1365233&r2=1365234&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageMap.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageMap.cpp Tue Jul 24 19:18:14 2012
@@ -146,7 +146,7 @@ bool MessageMap::push(const QueuedMessag
void MessageMap::setPosition(const framing::SequenceNumber& seq) {
// Nothing to do, just assert that the precondition is respected and there
// are no undeleted messages after seq.
- assert(messages.empty() || (--messages.end())->first <= seq);
+ (void) seq; assert(messages.empty() || (--messages.end())->first <= seq);
}
void MessageMap::foreach(Functor f)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org