Working towards abstracting away the cross platform uuid mess:

* Stop including indirectly from uuid.h in qpid/framing/Uuid.h
  and move inline definitions there into the implementation file

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@809781 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 6 deletions

diff --git a/cpp/src/tests/txtest.cpp b/cpp/src/tests/txtest.cpp
index c1ee246e2c..f604df7e21 100644
--- a/cpp/src/tests/txtest.cpp
+++ b/cpp/src/tests/txtest.cpp
@@ -33,7 +33,7 @@
 #include "qpid/client/SubscriptionManager.h"
 #include "qpid/framing/Array.h"
 #include "qpid/framing/Buffer.h"
-#include "qpid/sys/uuid.h"
+#include "qpid/framing/Uuid.h"
 #include "qpid/sys/Thread.h"
 
 using namespace qpid;
@@ -130,8 +130,6 @@ struct Transfer : public Client, public Runnable
     std::string src;
     std::string dest;
     Thread thread;
-    uuid_t uuid;
-    char uuidStr[37]; // Format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx + trailing \0
     framing::Xid xid;
 
     Transfer(const std::string& to, const std::string& from) : src(to), dest(from), xid(0x4c414e47, "", from) {}
@@ -184,9 +182,8 @@ struct Transfer : public Client, public Runnable
     }
 
     void setNewXid(framing::Xid& xid) {
-        ::uuid_generate(uuid);
-        ::uuid_unparse(uuid, uuidStr);
-        xid.setGlobalId(uuidStr);
+        framing::Uuid uuid(true);
+        xid.setGlobalId(uuid.str());
     }
 };