diff options
author | Charles E. Rolke <chug@apache.org> | 2012-12-07 22:59:55 +0000 |
---|---|---|
committer | Charles E. Rolke <chug@apache.org> | 2012-12-07 22:59:55 +0000 |
commit | 893ca363d6dc0ca1a878496f5f3b8215a5bfc82e (patch) | |
tree | 12e395ce1b6e3fefb3e328b80949a4b0ad818b3f | |
parent | d6e512848ca6ac9d25dc86226c13cc086f80afa1 (diff) | |
download | qpid-python-893ca363d6dc0ca1a878496f5f3b8215a5bfc82e.tar.gz |
NO-JIRA repair build for VisualStudio 2010
vector::push_back now has two signatures that confuse boost.
Use an explicit callback and do the push_back there.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.20@1418544 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/ha/BrokerReplicator.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp index 6b88111732..76f7341b4b 100644 --- a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp +++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp @@ -837,6 +837,13 @@ void BrokerReplicator::autoDeleteCheck(boost::shared_ptr<Exchange> ex) { } } +// Callback function for accumulating exchange candidates +namespace { + void exchangeAccumulatorCallback(vector<boost::shared_ptr<Exchange> >& c, const Exchange::shared_ptr& i) { + c.push_back(i); + } +} + void BrokerReplicator::disconnected() { QPID_LOG(info, logPrefix << "Disconnected"); connection = 0; @@ -844,7 +851,7 @@ void BrokerReplicator::disconnected() { vector<boost::shared_ptr<Exchange> > collect; // Make a copy so we can work outside the ExchangeRegistry lock exchanges.eachExchange( - boost::bind(&vector<boost::shared_ptr<Exchange> >::push_back, ref(collect), _1)); + boost::bind(&exchangeAccumulatorCallback, boost::ref(collect), _1)); for_each(collect.begin(), collect.end(), boost::bind(&BrokerReplicator::autoDeleteCheck, this, _1)); } |