diff options
author | Charles E. Rolke <chug@apache.org> | 2011-12-07 14:43:13 +0000 |
---|---|---|
committer | Charles E. Rolke <chug@apache.org> | 2011-12-07 14:43:13 +0000 |
commit | 9309d39996bb65a3d958209fb7b81a9d192b5870 (patch) | |
tree | d9be095fa5acb541b209549d8e29f3903cc6a1b1 | |
parent | d135e4a5024e5033170470d7b4603363a24647eb (diff) | |
download | qpid-python-9309d39996bb65a3d958209fb7b81a9d192b5870.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@1211458 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | qpid/cpp/src/cluster.cmake | 2 | ||||
-rw-r--r-- | qpid/cpp/src/qpid/UrlArray.h | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 6b6133c562..c5d2a45f69 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/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/qpid/cpp/src/cluster.cmake b/qpid/cpp/src/cluster.cmake index 48227c1a02..0b0e26141f 100644 --- a/qpid/cpp/src/cluster.cmake +++ b/qpid/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/qpid/cpp/src/qpid/UrlArray.h b/qpid/cpp/src/qpid/UrlArray.h index c82d5639f1..8b11df5c73 100644 --- a/qpid/cpp/src/qpid/UrlArray.h +++ b/qpid/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 */ |