diff options
| author | Charles E. Rolke <chug@apache.org> | 2014-11-21 22:38:01 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2014-11-21 22:38:01 +0000 |
| commit | 640bab3d20feee06f807dd821a963626a728304f (patch) | |
| tree | 9eebcdbde6bda0445a2b6f8222164af98a06159e /qpid/cpp/src | |
| parent | 0b47f82aabfbb8ca02ee484a097b4d197af5e1de (diff) | |
| download | qpid-python-640bab3d20feee06f807dd821a963626a728304f.tar.gz | |
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
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/amqp/Session.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<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)) { |