loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix Tag class test failures.

Browse Source
This commit is contained in:
Oliver Hamlet
2015-07-12 18:37:03 +01:00
parent 29da01c583
commit 4c77df11de
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/metadata/tag.h
+7 -4
View File
@@ -52,7 +52,8 @@ namespace YAML {
struct convert < loot::Tag > {
static Node encode(const loot::Tag& rhs) {
Node node;
node["condition"] = rhs.Condition();
if (rhs.IsConditional())
node["condition"] = rhs.Condition();
if (rhs.IsAddition())
node["name"] = rhs.Name();
else
@@ -61,17 +62,19 @@ namespace YAML {
}
static bool decode(const Node& node, loot::Tag& rhs) {
if (!node.IsMap() && !node.IsScalar())
return false;
std::string condition, tag;
if (node.IsMap()) {
if (!node["name"])
return false;
tag = node["name"].as<std::string>();
if (node["condition"])
condition = node["condition"].as<std::string>();
if (node["name"])
tag = node["name"].as<std::string>();
}
else if (node.IsScalar())
else
tag = node.as<std::string>();
if (tag[0] == '-')