From bc4dc29c20deff4bf9df1c6424315aa557c0ac72 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 6 Nov 2014 20:32:06 +0000
Subject: Fix compilation with compilers that fail to convert boost::optional
to bool (fix #990).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5478 a436a847-0d15-0410-975c-d299462d15a1
---
src/serialisation/Parser.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp
index e6e3f2c9..6a8547c5 100644
--- a/src/serialisation/Parser.cpp
+++ b/src/serialisation/Parser.cpp
@@ -615,11 +615,11 @@ Parser::parse_file(Ingen::World* world,
target->set_property(Node::path_to_uri(*parsed_path),
Raul::URI(INGEN__file),
world->forge().alloc_uri(uri));
+ return true;
} else {
world->log().warn("Document URI lost\n");
+ return false;
}
-
- return parsed_path;
}
bool
@@ -642,7 +642,7 @@ Parser::parse_string(Ingen::World* world,
world->log().info(fmt("Parsing string (base %1%)\n") % base_uri);
Sord::Node subject;
- return parse(world, target, model, base_uri, subject, parent, symbol, data);
+ return !!parse(world, target, model, base_uri, subject, parent, symbol, data);
}
} // namespace Serialisation
--
cgit v1.2.1