summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2012-05-16 14:49:59 +0000
committerCharles E. Rolke <chug@apache.org>2012-05-16 14:49:59 +0000
commitac5bbc5889eabda8bb3c32d2142469fa400c1f9e (patch)
tree02cfaa3747941a832bb7986e35470174beabf50e /cpp
parent2426896699144948695ab606c57d383a7b880f65 (diff)
downloadqpid-python-ac5bbc5889eabda8bb3c32d2142469fa400c1f9e.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/qpid@1339204 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/qpid/broker/Broker.h4
-rw-r--r--cpp/src/qpid/ha/ReplicatingSubscription.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index 089619ec44..1596e0632b 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/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/cpp/src/qpid/ha/ReplicatingSubscription.h b/cpp/src/qpid/ha/ReplicatingSubscription.h
index 97416249d0..b0aff18879 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.h
+++ b/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;
};