diff options
| author | Charles E. Rolke <chug@apache.org> | 2012-05-16 14:49:59 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2012-05-16 14:49:59 +0000 |
| commit | 0af8a9d232df62b0104d0e08d9fd8fd855486444 (patch) | |
| tree | 4a48e37856f41342640ad2cde93562207e65e609 | |
| parent | dd52dbe495642935a567c50868d5c1f714fb42c5 (diff) | |
| download | qpid-python-0af8a9d232df62b0104d0e08d9fd8fd855486444.tar.gz | |
QPID-3603 HA broker backup/primary ready checks. Repair r1338889 for Windows.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1339204 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.h | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/ha/ReplicatingSubscription.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h index 089619ec44..1596e0632b 100644 --- a/qpid/cpp/src/qpid/broker/Broker.h +++ b/qpid/cpp/src/qpid/broker/Broker.h @@ -381,8 +381,8 @@ class Broker : public sys::Runnable, public Plugin::Target, 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&); }; }} diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h index 97416249d0..b0aff18879 100644 --- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h +++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h @@ -136,7 +136,7 @@ class ReplicatingSubscription : public broker::SemanticState::ConsumerImpl, broker::OwnershipToken* getSession() { return 0; } }; - friend class Factory; + friend struct Factory; }; |