diff options
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/DtxWorkRecordTest.cpp | 24 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/TransactionObserverTest.cpp | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/qpid/cpp/src/tests/DtxWorkRecordTest.cpp b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp index 9d7666dca4..bcb3fc14a1 100644 --- a/qpid/cpp/src/tests/DtxWorkRecordTest.cpp +++ b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp @@ -41,10 +41,10 @@ QPID_AUTO_TEST_CASE(testOnePhaseCommit){ MockTxOp::shared_ptr opB(new MockTxOp()); opB->expectPrepare().expectCommit(); - DtxBuffer::shared_ptr bufferA(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferA(new DtxBuffer()); bufferA->enlist(static_pointer_cast<TxOp>(opA)); bufferA->markEnded(); - DtxBuffer::shared_ptr bufferB(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferB(new DtxBuffer()); bufferB->enlist(static_pointer_cast<TxOp>(opB)); bufferB->markEnded(); @@ -71,13 +71,13 @@ QPID_AUTO_TEST_CASE(testFailOnOnePhaseCommit){ MockTxOp::shared_ptr opC(new MockTxOp()); opC->expectRollback(); - DtxBuffer::shared_ptr bufferA(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferA(new DtxBuffer()); bufferA->enlist(static_pointer_cast<TxOp>(opA)); bufferA->markEnded(); - DtxBuffer::shared_ptr bufferB(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferB(new DtxBuffer()); bufferB->enlist(static_pointer_cast<TxOp>(opB)); bufferB->markEnded(); - DtxBuffer::shared_ptr bufferC(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferC(new DtxBuffer()); bufferC->enlist(static_pointer_cast<TxOp>(opC)); bufferC->markEnded(); @@ -105,10 +105,10 @@ QPID_AUTO_TEST_CASE(testTwoPhaseCommit){ MockTxOp::shared_ptr opB(new MockTxOp()); opB->expectPrepare().expectCommit(); - DtxBuffer::shared_ptr bufferA(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferA(new DtxBuffer()); bufferA->enlist(static_pointer_cast<TxOp>(opA)); bufferA->markEnded(); - DtxBuffer::shared_ptr bufferB(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferB(new DtxBuffer()); bufferB->enlist(static_pointer_cast<TxOp>(opB)); bufferB->markEnded(); @@ -136,13 +136,13 @@ QPID_AUTO_TEST_CASE(testFailOnTwoPhaseCommit){ MockTxOp::shared_ptr opC(new MockTxOp()); opC->expectRollback(); - DtxBuffer::shared_ptr bufferA(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferA(new DtxBuffer()); bufferA->enlist(static_pointer_cast<TxOp>(opA)); bufferA->markEnded(); - DtxBuffer::shared_ptr bufferB(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferB(new DtxBuffer()); bufferB->enlist(static_pointer_cast<TxOp>(opB)); bufferB->markEnded(); - DtxBuffer::shared_ptr bufferC(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferC(new DtxBuffer()); bufferC->enlist(static_pointer_cast<TxOp>(opC)); bufferC->markEnded(); @@ -168,10 +168,10 @@ QPID_AUTO_TEST_CASE(testRollback){ MockTxOp::shared_ptr opB(new MockTxOp()); opB->expectPrepare().expectRollback(); - DtxBuffer::shared_ptr bufferA(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferA(new DtxBuffer()); bufferA->enlist(static_pointer_cast<TxOp>(opA)); bufferA->markEnded(); - DtxBuffer::shared_ptr bufferB(new DtxBuffer()); + boost::intrusive_ptr<DtxBuffer> bufferB(new DtxBuffer()); bufferB->enlist(static_pointer_cast<TxOp>(opB)); bufferB->markEnded(); diff --git a/qpid/cpp/src/tests/TransactionObserverTest.cpp b/qpid/cpp/src/tests/TransactionObserverTest.cpp index fd1c331ae7..2a7d94b1ae 100644 --- a/qpid/cpp/src/tests/TransactionObserverTest.cpp +++ b/qpid/cpp/src/tests/TransactionObserverTest.cpp @@ -78,7 +78,7 @@ struct MockBrokerObserver : public BrokerObserver { MockBrokerObserver(bool prep_=true) : prep(prep_) {} - void startTx(const shared_ptr<TxBuffer>& buffer) { + void startTx(const intrusive_ptr<TxBuffer>& buffer) { tx.reset(new MockTransactionObserver(prep)); buffer->setObserver(tx); } |