Repository: activemq-cpp Updated Branches: refs/heads/master ba71c7d6e -> ca5901108
Fix a few more sign conversion warnings. Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/ca590110 Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/ca590110 Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/ca590110 Branch: refs/heads/master Commit: ca59011087ce4b654fd2986b02861b3b3ee07b5c Parents: ba71c7d Author: Timothy Bish <[email protected]> Authored: Fri Aug 7 12:18:53 2015 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri Aug 7 12:18:53 2015 -0400 ---------------------------------------------------------------------- .../src/main/activemq/commands/ActiveMQBytesMessage.cpp | 2 +- .../src/main/activemq/commands/ActiveMQObjectMessage.cpp | 2 +- .../src/main/activemq/commands/ActiveMQStreamMessage.cpp | 8 ++++---- .../src/main/activemq/core/ActiveMQTransactionContext.cpp | 8 ++++---- .../src/main/activemq/core/FifoMessageDispatchChannel.cpp | 2 +- .../activemq/core/SimplePriorityMessageDispatchChannel.cpp | 2 +- activemq-cpp/src/main/decaf/util/LinkedList.h | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp b/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp index d8cd596..a630816 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp @@ -243,7 +243,7 @@ unsigned char ActiveMQBytesMessage::readByte() const { initializeReading(); try { - return this->dataIn->readByte(); + return (unsigned char) this->dataIn->readByte(); } catch (EOFException& ex) { throw CMSExceptionSupport::createMessageEOFException(ex); } catch (IOException& ex) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp b/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp index 112320f..77e14ce 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQObjectMessage.cpp @@ -129,7 +129,7 @@ std::vector<unsigned char> ActiveMQObjectMessage::getObjectBytes() const { return std::vector<unsigned char>(); } - uncompressed.resize(length); + uncompressed.resize((std::size_t) length); } catch (IOException& ex) { throw CMSExceptionSupport::create(ex); } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp b/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp index b38ba71..1edbc8d 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp @@ -249,7 +249,7 @@ unsigned char ActiveMQStreamMessage::readByte() const { throw MessageEOFException("reached end of data", NULL); } if (type == PrimitiveValueNode::BYTE_TYPE) { - return this->dataIn->readByte(); + return (unsigned char) this->dataIn->readByte(); } if (type == PrimitiveValueNode::STRING_TYPE) { return Byte::valueOf(this->dataIn->readUTF()).byteValue(); @@ -628,10 +628,10 @@ unsigned short ActiveMQStreamMessage::readUnsignedShort() const { return this->dataIn->readUnsignedShort(); } if (type == PrimitiveValueNode::BYTE_TYPE) { - return this->dataIn->readByte(); + return (unsigned char) this->dataIn->readByte(); } if (type == PrimitiveValueNode::STRING_TYPE) { - return Short::valueOf(this->dataIn->readUTF()).shortValue(); + return (unsigned short) Short::valueOf(this->dataIn->readUTF()).shortValue(); } if (type == PrimitiveValueNode::NULL_TYPE) { @@ -832,7 +832,7 @@ std::string ActiveMQStreamMessage::readString() const { return Short(this->dataIn->readShort()).toString(); } if (type == PrimitiveValueNode::BYTE_TYPE) { - return Byte(this->dataIn->readByte()).toString(); + return Byte((unsigned char) this->dataIn->readByte()).toString(); } if (type == PrimitiveValueNode::FLOAT_TYPE) { return Float(this->dataIn->readFloat()).toString(); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/core/ActiveMQTransactionContext.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/ActiveMQTransactionContext.cpp b/activemq-cpp/src/main/activemq/core/ActiveMQTransactionContext.cpp index dbd81b3..1a155e6 100644 --- a/activemq-cpp/src/main/activemq/core/ActiveMQTransactionContext.cpp +++ b/activemq-cpp/src/main/activemq/core/ActiveMQTransactionContext.cpp @@ -715,8 +715,8 @@ bool ActiveMQTransactionContext::equals(const cms::Xid* local, const cms::Xid* r return false; } else { - std::vector<unsigned char> localBQual(Xid::MAXBQUALSIZE); - std::vector<unsigned char> remoteBQual(Xid::MAXBQUALSIZE); + std::vector<unsigned char> localBQual((std::size_t) Xid::MAXBQUALSIZE); + std::vector<unsigned char> remoteBQual((std::size_t) Xid::MAXBQUALSIZE); local->getBranchQualifier(&localBQual[0], Xid::MAXBQUALSIZE); remote->getBranchQualifier(&remoteBQual[0], Xid::MAXBQUALSIZE); @@ -725,8 +725,8 @@ bool ActiveMQTransactionContext::equals(const cms::Xid* local, const cms::Xid* r return false; } - std::vector<unsigned char> localGTXID(Xid::MAXBQUALSIZE); - std::vector<unsigned char> remoteGTXID(Xid::MAXBQUALSIZE); + std::vector<unsigned char> localGTXID((std::size_t) Xid::MAXBQUALSIZE); + std::vector<unsigned char> remoteGTXID((std::size_t) Xid::MAXBQUALSIZE); local->getGlobalTransactionId(&localGTXID[0], Xid::MAXGTRIDSIZE); remote->getGlobalTransactionId(&remoteGTXID[0], Xid::MAXGTRIDSIZE); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/core/FifoMessageDispatchChannel.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/FifoMessageDispatchChannel.cpp b/activemq-cpp/src/main/activemq/core/FifoMessageDispatchChannel.cpp index 8099992..0a773aa 100644 --- a/activemq-cpp/src/main/activemq/core/FifoMessageDispatchChannel.cpp +++ b/activemq-cpp/src/main/activemq/core/FifoMessageDispatchChannel.cpp @@ -69,7 +69,7 @@ Pointer<MessageDispatch> FifoMessageDispatchChannel::dequeue(long long timeout) if (timeout == -1) { channel.wait(); } else { - channel.wait((unsigned long) timeout); + channel.wait(timeout); break; } } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/activemq/core/SimplePriorityMessageDispatchChannel.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/core/SimplePriorityMessageDispatchChannel.cpp b/activemq-cpp/src/main/activemq/core/SimplePriorityMessageDispatchChannel.cpp index d3390d4..ddcb80e 100644 --- a/activemq-cpp/src/main/activemq/core/SimplePriorityMessageDispatchChannel.cpp +++ b/activemq-cpp/src/main/activemq/core/SimplePriorityMessageDispatchChannel.cpp @@ -36,7 +36,7 @@ const int SimplePriorityMessageDispatchChannel::MAX_PRIORITIES = 10; //////////////////////////////////////////////////////////////////////////////// SimplePriorityMessageDispatchChannel::SimplePriorityMessageDispatchChannel() : - closed(false), running(false), mutex(), channels(MAX_PRIORITIES), enqueued(0) { + closed(false), running(false), mutex(), channels((std::size_t) MAX_PRIORITIES), enqueued(0) { } //////////////////////////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/ca590110/activemq-cpp/src/main/decaf/util/LinkedList.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/decaf/util/LinkedList.h b/activemq-cpp/src/main/decaf/util/LinkedList.h index bb7f42d..149a736 100644 --- a/activemq-cpp/src/main/decaf/util/LinkedList.h +++ b/activemq-cpp/src/main/decaf/util/LinkedList.h @@ -280,7 +280,7 @@ namespace util { virtual std::vector<E> toArray() const { std::vector<E> result; - result.reserve(this->listSize); + result.reserve((std::size_t) this->listSize); const ListNode<E>* current = this->head.next;
