From 2f149e005175b204dd283f89af5e05e0a44d87c7 Mon Sep 17 00:00:00 2001 From: "Charles E. Rolke" Date: Wed, 7 Dec 2011 14:43:13 +0000 Subject: 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 --- cpp/src/CMakeLists.txt | 1 + cpp/src/cluster.cmake | 2 ++ cpp/src/qpid/UrlArray.h | 6 +++--- 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 urlArrayToVector(const framing::Array& array); -framing::Array vectorToUrlArray(const std::vector& urls); +QPID_COMMON_EXTERN std::vector urlArrayToVector(const framing::Array& array); +QPID_COMMON_EXTERN framing::Array vectorToUrlArray(const std::vector& urls); } // namespace qpid -#endif /*!QPID_CLUSTER_URLARRAY_H*/ +#endif /* !QPID_CLUSTER_URLARRAY_H */ -- cgit v1.2.1