From 0e3d465bfd951e2d5627ae996b104b1e0f7387a6 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Fri, 17 Jan 2014 05:55:31 +0000 Subject: 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/qpid@1559017 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/System.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/qpid/broker/System.cpp') diff --git a/cpp/src/qpid/broker/System.cpp b/cpp/src/qpid/broker/System.cpp index f3b6f96d0c..f3535b0eec 100644 --- a/cpp/src/qpid/broker/System.cpp +++ b/cpp/src/qpid/broker/System.cpp @@ -64,7 +64,7 @@ System::System (string _dataDir, Broker* broker) } } - mgmtObject = _qmf::System::shared_ptr(new _qmf::System(agent, this, types::Uuid(systemId.c_array()))); + mgmtObject = _qmf::System::shared_ptr(new _qmf::System(agent, this, systemId)); qpid::sys::SystemInfo::getSystemId (osName, nodeName, release, -- cgit v1.2.1