Author: aconway
Date: Fri Aug 2 21:08:22 2013
New Revision: 1509861
URL: http://svn.apache.org/r1509861
Log:
QPID-4327: HA Fix windows compile errors introduced by recent commits.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Link.h
qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h
qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h
qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp
qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.h?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.h Fri Aug 2 21:08:22 2013
@@ -151,8 +151,8 @@ class Link : public PersistableConfig, p
bool isDurable() { return durable; }
void maintenanceVisit ();
- framing::ChannelId nextChannel(); // allocate channel from link
free pool
- void returnChannel(framing::ChannelId); // return channel to link free
pool
+ QPID_BROKER_EXTERN framing::ChannelId nextChannel(); // allocate
channel from link free pool
+ QPID_BROKER_EXTERN void returnChannel(framing::ChannelId); // return
channel to link free pool
void add(Bridge::shared_ptr);
void cancel(Bridge::shared_ptr);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxAccept.h Fri Aug 2 21:08:22 2013
@@ -22,6 +22,7 @@
#define _TxAccept_
#include "qpid/framing/SequenceSet.h"
+#include "qpid/broker/BrokerImportExport.h"
#include "qpid/broker/DeliveryRecord.h"
#include "qpid/broker/TxOp.h"
#include <boost/function.hpp>
@@ -51,7 +52,7 @@ class TxAccept : public TxOp {
* acks received
* @param unacked the record of delivered messages
*/
- TxAccept(const framing::SequenceSet& acked, DeliveryRecords& unacked);
+ QPID_BROKER_EXTERN TxAccept(const framing::SequenceSet& acked,
DeliveryRecords& unacked);
virtual bool prepare(TransactionContext* ctxt) throw();
virtual void commit() throw();
virtual void rollback() throw();
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxBuffer.h Fri Aug 2 21:08:22 2013
@@ -71,7 +71,7 @@ class TxBuffer {
public:
typedef boost::shared_ptr<TxBuffer> shared_ptr;
- TxBuffer();
+ QPID_BROKER_EXTERN TxBuffer();
/**
* Adds an operation to the transaction.
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/Membership.cpp Fri Aug 2 21:08:22 2013
@@ -111,7 +111,7 @@ BrokerInfo::Set Membership::getBrokers()
Mutex::ScopedLock l(lock);
BrokerInfo::Set result;
transform(brokers.begin(), brokers.end(), inserter(result, result.begin()),
- bind(&BrokerInfo::Map::value_type::second, _1));
+ boost::bind(&BrokerInfo::Map::value_type::second, _1));
return result;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp Fri Aug 2 21:08:22
2013
@@ -40,7 +40,6 @@ class FieldTable;
namespace ha {
using namespace std;
-using namespace boost;
using namespace qpid::broker;
using namespace qpid::framing;
@@ -70,7 +69,7 @@ class PrimaryTxObserver::Exchange : publ
private:
static const string TYPE_NAME;
- typedef function<void(const std::string&)> DispatchFn;
+ typedef boost::function<void(const std::string&)> DispatchFn;
typedef qpid::sys::unordered_map<std::string, DispatchFn> DispatchMap;
DispatchMap dispatch;
@@ -89,11 +88,11 @@ PrimaryTxObserver::PrimaryTxObserver(HaB
// when the tx-queue is deleted.
//
BrokerInfo::Set infoSet(haBroker.getMembership().otherBackups());
- transform(infoSet.begin(), infoSet.end(), inserter(backups,
backups.begin()),
- bind(&BrokerInfo::getSystemId, _1));
+ std::transform(infoSet.begin(), infoSet.end(), inserter(backups,
backups.begin()),
+ boost::bind(&BrokerInfo::getSystemId, _1));
QPID_LOG(debug, logPrefix << "Started on " << backups);
- pair<shared_ptr<Queue>, bool> result =
+ pair<QueuePtr, bool> result =
broker.getQueues().declare(
TRANSACTION_REPLICATOR_PREFIX+id.str(),
QueueSettings(/*durable*/false, /*autodelete*/true));
@@ -102,7 +101,7 @@ PrimaryTxObserver::PrimaryTxObserver(HaB
}
void PrimaryTxObserver::initialize() {
-
broker.getExchanges().registerExchange(make_shared<Exchange>(shared_from_this()));
+
broker.getExchanges().registerExchange(boost::make_shared<Exchange>(shared_from_this()));
}
void PrimaryTxObserver::enqueue(const QueuePtr& q, const broker::Message& m)
@@ -123,7 +122,7 @@ void PrimaryTxObserver::dequeue(
}
void PrimaryTxObserver::deduplicate(sys::Mutex::ScopedLock&) {
- shared_ptr<Primary>
primary(boost::dynamic_pointer_cast<Primary>(haBroker.getRole()));
+ boost::shared_ptr<Primary>
primary(boost::dynamic_pointer_cast<Primary>(haBroker.getRole()));
assert(primary);
// Tell replicating subscriptions to skip IDs in the transaction.
for (UuidSet::iterator b = backups.begin(); b != backups.end(); ++b)
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/QueueReplicator.cpp Fri Aug 2 21:08:22 2013
@@ -47,7 +47,6 @@ namespace ha {
using namespace broker;
using namespace framing;
using namespace std;
-using namespace boost;
using std::exception;
using sys::Mutex;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp Fri Aug 2
21:08:22 2013
@@ -46,7 +46,6 @@ namespace ha {
using namespace framing;
using namespace broker;
using namespace std;
-using namespace boost;
using sys::Mutex;
using broker::amqp_0_10::MessageTransfer;
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h Fri Aug 2
21:08:22 2013
@@ -43,7 +43,7 @@ class Buffer;
namespace ha {
class QueueGuard;
class HaBroker;
-class Event;
+struct Event;
class Primary;
/**
Modified: qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/TxReplicator.cpp Fri Aug 2 21:08:22 2013
@@ -47,11 +47,11 @@ namespace qpid {
namespace ha {
using namespace std;
-using namespace boost;
using namespace qpid::broker;
using namespace qpid::framing;
using qpid::broker::amqp_0_10::MessageTransfer;
using qpid::types::Uuid;
+using boost::make_shared;
namespace {
const string QPID_HA(QPID_HA_PREFIX);
@@ -87,7 +87,7 @@ TxReplicator::TxReplicator(
logPrefix = "Backup of transaction "+shortId+": ";
if (!store) throw Exception(QPID_MSG(logPrefix << "No message store
loaded."));
- boost::shared_ptr<Backup> backup =
dynamic_pointer_cast<Backup>(hb.getRole());
+ boost::shared_ptr<Backup> backup =
boost::dynamic_pointer_cast<Backup>(hb.getRole());
if (!backup) throw Exception(QPID_MSG(logPrefix << "Broker is not in
backup mode."));
brokerReplicator = backup->getBrokerReplicator();
@@ -195,7 +195,7 @@ void TxReplicator::DequeueState::addReco
boost::shared_ptr<TxAccept> TxReplicator::DequeueState::makeAccept() {
for_each(events.begin(), events.end(),
boost::bind(&TxReplicator::DequeueState::addRecords, this, _1));
- return make_shared<TxAccept>(cref(recordIds), ref(records));
+ return boost::make_shared<TxAccept>(boost::cref(recordIds),
boost::ref(records));
}
void TxReplicator::prepare(const string&, sys::Mutex::ScopedLock& l) {
Modified: qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp?rev=1509861&r1=1509860&r2=1509861&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/TransactionObserverTest.cpp Fri Aug 2
21:08:22 2013
@@ -39,7 +39,9 @@ namespace qpid {
namespace tests {
using framing::SequenceSet;
-using messaging::Message;
+using messaging::Message;
+using boost::shared_ptr;
+using boost::make_shared;
using namespace boost::assign;
using namespace boost;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
