From c62deabcc032743c84b1047c9daaa6c0277118a9 Mon Sep 17 00:00:00 2001 From: fps Date: Tue, 26 Nov 2013 12:46:54 +0000 Subject: [PATCH] fix bug in parser options concatenation --- src/XAO/XAO_XaoExporter.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/XAO/XAO_XaoExporter.cxx b/src/XAO/XAO_XaoExporter.cxx index bd34efafb..c873bdb0d 100644 --- a/src/XAO/XAO_XaoExporter.cxx +++ b/src/XAO/XAO_XaoExporter.cxx @@ -636,7 +636,7 @@ const bool XaoExporter::readFromFile(const std::string& fileName, Xao* xaoObject throw (XAO_Exception) { // parse the file and get the DOM - int options = XML_PARSE_HUGE || XML_PARSE_NOCDATA; + int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA; xmlDocPtr doc = xmlReadFile(fileName.c_str(), NULL, options); if (doc == NULL) { @@ -650,7 +650,7 @@ throw (XAO_Exception) const bool XaoExporter::setXML(const std::string& xml, Xao* xaoObject) throw (XAO_Exception) { - int options = XML_PARSE_HUGE || XML_PARSE_NOCDATA; + int options = XML_PARSE_HUGE | XML_PARSE_NOCDATA; xmlDocPtr doc = xmlReadDoc(BAD_CAST xml.c_str(), "", NULL, options); if (doc == NULL) { -- 2.39.2