From dde0d399f616d9ca7ef34094de8649f97bbb7dd2 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Fri, 9 Jan 2015 21:42:55 -0800
Subject: [PATCH] Implicit conversion to plString is apparently an MSVC thing

---
 .../PubUtilLib/plVault/plVaultClientApi.cpp      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp
index 86ae798c..e3092106 100644
--- a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp
+++ b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp
@@ -1383,6 +1383,10 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
     case k##flag: \
         ss << ", " #flag "=\"" << Get##flag() << "\""; \
         break;
+#define STPRINT_UUID(flag) \
+    case k##flag: \
+        ss << ", " #flag "=\"" << Get##flag().AsString() << "\""; \
+        break;
 #define STPRINT_ESCAPE(flag) \
     case k##flag: \
         ss << ", " #flag "=\"" << Get##flag().Replace("\"", "\\\"") << "\""; \
@@ -1397,8 +1401,8 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
             STPRINT(CreateTime);
             STPRINT(ModifyTime);
             STPRINT(CreateAgeName);
-            STPRINT(CreateAgeUuid);
-            STPRINT(CreatorAcct);
+            STPRINT_UUID(CreateAgeUuid);
+            STPRINT_UUID(CreatorAcct);
             STPRINT(CreatorId);
             STPRINT(NodeType);
             STPRINT(Int32_1);
@@ -1409,10 +1413,10 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
             STPRINT(UInt32_2);
             STPRINT(UInt32_3);
             STPRINT(UInt32_4);
-            STPRINT(Uuid_1);
-            STPRINT(Uuid_2);
-            STPRINT(Uuid_3);
-            STPRINT(Uuid_4);
+            STPRINT_UUID(Uuid_1);
+            STPRINT_UUID(Uuid_2);
+            STPRINT_UUID(Uuid_3);
+            STPRINT_UUID(Uuid_4);
             STPRINT_ESCAPE(String64_1);
             STPRINT_ESCAPE(String64_2);
             STPRINT_ESCAPE(String64_3);