1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00

Implicit conversion to plString is apparently an MSVC thing

This commit is contained in:
2015-01-09 21:42:55 -08:00
parent 8bbb560966
commit dde0d399f6

View File

@ -1383,6 +1383,10 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
case k##flag: \ case k##flag: \
ss << ", " #flag "=\"" << Get##flag() << "\""; \ ss << ", " #flag "=\"" << Get##flag() << "\""; \
break; break;
#define STPRINT_UUID(flag) \
case k##flag: \
ss << ", " #flag "=\"" << Get##flag().AsString() << "\""; \
break;
#define STPRINT_ESCAPE(flag) \ #define STPRINT_ESCAPE(flag) \
case k##flag: \ case k##flag: \
ss << ", " #flag "=\"" << Get##flag().Replace("\"", "\\\"") << "\""; \ ss << ", " #flag "=\"" << Get##flag().Replace("\"", "\\\"") << "\""; \
@ -1397,8 +1401,8 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
STPRINT(CreateTime); STPRINT(CreateTime);
STPRINT(ModifyTime); STPRINT(ModifyTime);
STPRINT(CreateAgeName); STPRINT(CreateAgeName);
STPRINT(CreateAgeUuid); STPRINT_UUID(CreateAgeUuid);
STPRINT(CreatorAcct); STPRINT_UUID(CreatorAcct);
STPRINT(CreatorId); STPRINT(CreatorId);
STPRINT(NodeType); STPRINT(NodeType);
STPRINT(Int32_1); STPRINT(Int32_1);
@ -1409,10 +1413,10 @@ void RelVaultNode::Print (const plString& tag, unsigned level) {
STPRINT(UInt32_2); STPRINT(UInt32_2);
STPRINT(UInt32_3); STPRINT(UInt32_3);
STPRINT(UInt32_4); STPRINT(UInt32_4);
STPRINT(Uuid_1); STPRINT_UUID(Uuid_1);
STPRINT(Uuid_2); STPRINT_UUID(Uuid_2);
STPRINT(Uuid_3); STPRINT_UUID(Uuid_3);
STPRINT(Uuid_4); STPRINT_UUID(Uuid_4);
STPRINT_ESCAPE(String64_1); STPRINT_ESCAPE(String64_1);
STPRINT_ESCAPE(String64_2); STPRINT_ESCAPE(String64_2);
STPRINT_ESCAPE(String64_3); STPRINT_ESCAPE(String64_3);