summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2011-12-07 14:43:13 +0000
committerCharles E. Rolke <chug@apache.org>2011-12-07 14:43:13 +0000
commit2f149e005175b204dd283f89af5e05e0a44d87c7 (patch)
tree07c7758f0ec1727e8c7fe9bb37cd660d4e8c7b94
parent73d75f77aa47d5d21dc92b658014ac739c14d6e3 (diff)
downloadqpid-python-2f149e005175b204dd283f89af5e05e0a44d87c7.tar.gz
QPID-3652 Fix cluster authentication
Add missing additions to CMakeLists. Add windows export macro so new functions are published in dll. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1211458 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--cpp/src/CMakeLists.txt1
-rw-r--r--cpp/src/cluster.cmake2
-rw-r--r--cpp/src/qpid/UrlArray.h6
3 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 6b6133c562..c5d2a45f69 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -784,6 +784,7 @@ set (qpidcommon_SOURCES
qpid/SessionId.cpp
qpid/StringUtils.cpp
qpid/Url.cpp
+ qpid/UrlArray.cpp
qpid/amqp_0_10/SessionHandler.cpp
qpid/framing/AccumulatedAck.cpp
qpid/framing/AMQBody.cpp
diff --git a/cpp/src/cluster.cmake b/cpp/src/cluster.cmake
index 48227c1a02..0b0e26141f 100644
--- a/cpp/src/cluster.cmake
+++ b/cpp/src/cluster.cmake
@@ -96,6 +96,8 @@ if (BUILD_CLUSTER)
qpid/cluster/ConnectionCodec.h
qpid/cluster/Cpg.cpp
qpid/cluster/Cpg.h
+ qpid/cluster/CredentialsExchange.cpp
+ qpid/cluster/CredentialsExchange.h
qpid/cluster/Dispatchable.h
qpid/cluster/UpdateClient.cpp
qpid/cluster/UpdateClient.h
diff --git a/cpp/src/qpid/UrlArray.h b/cpp/src/qpid/UrlArray.h
index c82d5639f1..8b11df5c73 100644
--- a/cpp/src/qpid/UrlArray.h
+++ b/cpp/src/qpid/UrlArray.h
@@ -30,8 +30,8 @@
namespace qpid {
/** @file Functions to encode/decode an array of URLs. */
-std::vector<Url> urlArrayToVector(const framing::Array& array);
-framing::Array vectorToUrlArray(const std::vector<Url>& urls);
+QPID_COMMON_EXTERN std::vector<Url> urlArrayToVector(const framing::Array& array);
+QPID_COMMON_EXTERN framing::Array vectorToUrlArray(const std::vector<Url>& urls);
} // namespace qpid
-#endif /*!QPID_CLUSTER_URLARRAY_H*/
+#endif /* !QPID_CLUSTER_URLARRAY_H */