summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/qpid/ha/Primary.cpp
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2014-01-17 05:55:31 +0000
committerAndrew Stitcher <astitcher@apache.org>2014-01-17 05:55:31 +0000
commitdc4ef6282e60541161216d92c9693a87c64ae671 (patch)
treeba7206616a197874cdce7fc134e62162c4766078 /qpid/cpp/src/qpid/ha/Primary.cpp
parentb5a8f3813ed365e63b354581f9b4a624f0174a96 (diff)
downloadqpid-python-dc4ef6282e60541161216d92c9693a87c64ae671.tar.gz
QPID-5489: Uuid code improvements
- Don't use uuid_compare() as it will get the wrong version of the function under FreeBSD which has a uuid library build into libc with different function signatures from libuuid but some overlapping names. - Reorganise the uuid code to limit the used external symbols to uuid_generate(), uuid_parse(), uuid_unparse() - Minimise the framing::Uuid code so that it is a simple wrapper around types::Uuid - Use uuid_generate() as the symbol to search in CMake (uuid_compare() isn't used in qpid anymore). git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1559017 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.cpp')
-rw-r--r--qpid/cpp/src/qpid/ha/Primary.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index b29a550559..496704f737 100644
--- a/qpid/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -284,7 +284,7 @@ void Primary::exchangeCreate(const ExchangePtr& ex) {
QPID_LOG(debug, logPrefix << "Created exchange " << ex->getName()
<< " replication: " << printable(level));
// Give each exchange a unique id to avoid confusion of same-named exchanges.
- args.set(QPID_HA_UUID, FieldTable::ValuePtr(new UuidValue(&Uuid(true)[0])));
+ args.set(QPID_HA_UUID, FieldTable::ValuePtr(new UuidValue(Uuid(true).data())));
}
ex->setArgs(args);
}