summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2014-08-21 09:08:46 +0000
committerGordon Sim <gsim@apache.org>2014-08-21 09:08:46 +0000
commitce5458d19c4181e8729af06ee9f56b7d36ec10f8 (patch)
treef3fa680f1f561a8085cf8b8c0b4ea00411349474 /qpid/cpp/src
parentcd030a240f41fc55994659a8724cfbd225dfdf7d (diff)
downloadqpid-python-ce5458d19c4181e8729af06ee9f56b7d36ec10f8.tar.gz
QPID-6021: fix compile error on windows
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1619318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Connection.cpp4
-rw-r--r--qpid/cpp/src/qpid/broker/amqp/Connection.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
index 34afc955f1..6754afc0d8 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
@@ -168,9 +168,9 @@ size_t Connection::encode(char* buffer, size_t size)
}
}
-void Connection::doOutput(ssize_t capacity)
+void Connection::doOutput(size_t capacity)
{
- for (ssize_t n = pn_transport_pending(transport); n > 0 && n < capacity; n = pn_transport_pending(transport)) {
+ for (ssize_t n = pn_transport_pending(transport); n > 0 && n < (ssize_t) capacity; n = pn_transport_pending(transport)) {
if (dispatch()) processDeliveries();
else break;
}
diff --git a/qpid/cpp/src/qpid/broker/amqp/Connection.h b/qpid/cpp/src/qpid/broker/amqp/Connection.h
index 150df230d3..ed9a3a26b7 100644
--- a/qpid/cpp/src/qpid/broker/amqp/Connection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.h
@@ -72,7 +72,7 @@ class Connection : public BrokerContext, public sys::ConnectionCodec, public Man
bool closeRequested;
virtual void process();
- void doOutput(ssize_t);
+ void doOutput(size_t);
bool dispatch();
void processDeliveries();
std::string getError();