QPID-4327: HA Fix windows compile errors introduced by recent commits.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1509861 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 19 insertions, 19 deletions

diff --git a/cpp/src/qpid/broker/Link.h b/cpp/src/qpid/broker/Link.h
index d9924feec3..ceee0186f3 100644
--- a/cpp/src/qpid/broker/Link.h
+++ b/cpp/src/qpid/broker/Link.h
@@ -151,8 +151,8 @@ class Link : public PersistableConfig, public management::Manageable {
 
     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);
 
diff --git a/cpp/src/qpid/broker/TxAccept.h b/cpp/src/qpid/broker/TxAccept.h
index 7b01fc26dc..b4d55155a8 100644
--- a/cpp/src/qpid/broker/TxAccept.h
+++ b/cpp/src/qpid/broker/TxAccept.h
@@ -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();
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/cpp/src/qpid/broker/TxBuffer.h
index 47de080fad..4570c570a2 100644
--- a/cpp/src/qpid/broker/TxBuffer.h
+++ b/cpp/src/qpid/broker/TxBuffer.h
@@ -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.
diff --git a/cpp/src/qpid/ha/Membership.cpp b/cpp/src/qpid/ha/Membership.cpp
index b53291ba89..af57145cc2 100644
--- a/cpp/src/qpid/ha/Membership.cpp
+++ b/cpp/src/qpid/ha/Membership.cpp
@@ -111,7 +111,7 @@ BrokerInfo::Set Membership::getBrokers() const {
     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;
 }
 
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/cpp/src/qpid/ha/PrimaryTxObserver.cpp
index b63a40234e..d30fa06caa 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.cpp
+++ b/cpp/src/qpid/ha/PrimaryTxObserver.cpp
@@ -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 : public broker::Exchange {
 
   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(HaBroker& hb) :
     // 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(HaBroker& hb) :
 }
 
 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)
diff --git a/cpp/src/qpid/ha/QueueReplicator.cpp b/cpp/src/qpid/ha/QueueReplicator.cpp
index 9149567cf2..a4dd656766 100644
--- a/cpp/src/qpid/ha/QueueReplicator.cpp
+++ b/cpp/src/qpid/ha/QueueReplicator.cpp
@@ -47,7 +47,6 @@ namespace ha {
 using namespace broker;
 using namespace framing;
 using namespace std;
-using namespace boost;
 using std::exception;
 using sys::Mutex;
 
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/cpp/src/qpid/ha/ReplicatingSubscription.cpp
index 9f464f8066..176fd2e3aa 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+++ b/cpp/src/qpid/ha/ReplicatingSubscription.cpp
@@ -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;
 
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.h b/cpp/src/qpid/ha/ReplicatingSubscription.h
index 71993bcb12..bbc193ac78 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.h
+++ b/cpp/src/qpid/ha/ReplicatingSubscription.h
@@ -43,7 +43,7 @@ class Buffer;
 namespace ha {
 class QueueGuard;
 class HaBroker;
-class Event;
+struct Event;
 class Primary;
 
 /**
diff --git a/cpp/src/qpid/ha/TxReplicator.cpp b/cpp/src/qpid/ha/TxReplicator.cpp
index 0a524c8ced..3b53cf9886 100644
--- a/cpp/src/qpid/ha/TxReplicator.cpp
+++ b/cpp/src/qpid/ha/TxReplicator.cpp
@@ -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::addRecords(const EventMap::value_type& entry) {
 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) {
diff --git a/cpp/src/tests/TransactionObserverTest.cpp b/cpp/src/tests/TransactionObserverTest.cpp
index f570837ccf..bc65c493c8 100644
--- a/cpp/src/tests/TransactionObserverTest.cpp
+++ b/cpp/src/tests/TransactionObserverTest.cpp
@@ -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;