Author: chug
Date: Wed May 16 14:49:59 2012
New Revision: 1339204
URL: http://svn.apache.org/viewvc?rev=1339204&view=rev
Log:
QPID-3603 HA broker backup/primary ready checks. Repair r1338889 for Windows.
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1339204&r1=1339203&r2=1339204&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Wed May 16 14:49:59 2012
@@ -381,8 +381,8 @@ class Broker : public sys::Runnable, pub
ConnectionObservers& getConnectionObservers() { return
connectionObservers; }
/** Properties to be set on outgoing link connections */
- framing::FieldTable getLinkClientProperties() const;
- void setLinkClientProperties(const framing::FieldTable&);
+ QPID_BROKER_EXTERN framing::FieldTable getLinkClientProperties() const;
+ QPID_BROKER_EXTERN void setLinkClientProperties(const
framing::FieldTable&);
};
}}
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=1339204&r1=1339203&r2=1339204&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h Wed May 16
14:49:59 2012
@@ -136,7 +136,7 @@ class ReplicatingSubscription : public b
broker::OwnershipToken* getSession() { return 0; }
};
- friend class Factory;
+ friend struct Factory;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
