summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-07-11 15:02:36 +0000
committerAlan Conway <aconway@apache.org>2012-07-11 15:02:36 +0000
commitf754a184bedcdb4e33033d2980daa4189bf55ec6 (patch)
tree8bba3b64e1ba6e7efafdeca8eecb5cc893c4e91e /qpid/cpp
parentc034505762a27b3ac172ab474d6c3a97bc84210a (diff)
downloadqpid-python-f754a184bedcdb4e33033d2980daa4189bf55ec6.tar.gz
QPID-4128: Remove use of intrusive_ptr::reset, not available in older boost versions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1360218 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/src/qpid/ha/Primary.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index a1ce81c3a5..feb18528ff 100644
--- a/qpid/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -101,7 +101,7 @@ Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) :
// Set timeout for expected brokers to connect and become ready.
sys::Duration timeout(hb.getSettings().backupTimeout*sys::TIME_SEC);
sys::AbsTime deadline(sys::now(), timeout);
- timerTask.reset(new ExpectedBackupTimerTask(*this, deadline));
+ timerTask = new ExpectedBackupTimerTask(*this, deadline);
hb.getBroker().getTimer().add(timerTask);
}