Author: chug
Date: Fri Nov 21 22:38:01 2014
New Revision: 1641014
URL: http://svn.apache.org/r1641014
Log:
QPID-6241: Windows build fails. Add c-style cast to 0 for creating a null
pointer.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp?rev=1641014&r1=1641013&r2=1641014&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/amqp/Session.cpp Fri Nov 21 22:38:01
2014
@@ -739,7 +739,7 @@ TxBuffer* Session::getTransaction(pn_del
std::pair<TxBuffer*,uint64_t> Session::getTransactionalState(pn_delivery_t*
delivery)
{
- std::pair<TxBuffer*,uint64_t> result(0, 0);
+ std::pair<TxBuffer*,uint64_t> result((TxBuffer*)0, 0);
if (pn_delivery_remote_state(delivery) ==
qpid::amqp::transaction::TRANSACTIONAL_STATE_CODE) {
pn_data_t* data = pn_disposition_data(pn_delivery_remote(delivery));
if (data && pn_data_next(data)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
