From 640bab3d20feee06f807dd821a963626a728304f Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Fri, 21 Nov 2014 22:38:01 +0000 Subject: QPID-6241: Windows build fails. Add c-style cast to 0 for creating a null pointer. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1641014 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/broker/amqp/Session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp index dc7f2695c2..85da8c0c21 100644 --- a/qpid/cpp/src/qpid/broker/amqp/Session.cpp +++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp @@ -739,7 +739,7 @@ TxBuffer* Session::getTransaction(pn_delivery_t* delivery) std::pair Session::getTransactionalState(pn_delivery_t* delivery) { - std::pair result(0, 0); + std::pair 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)) { -- cgit v1.2.1