aboutsummaryrefslogtreecommitdiff
path: root/src/function/read_file.cc
diff options
context:
space:
mode:
authorAdrian Kummerlaender2016-01-05 21:17:42 +0100
committerAdrian Kummerlaender2016-01-05 21:17:42 +0100
commit1df71e9b78fd516f9902f42db733f0b02808ad50 (patch)
treef6a79cdb5f43ed112a880c47f234203857f6bc40 /src/function/read_file.cc
parent93af7b2094759d1187c5e9ead8eba6cab557ca18 (diff)
downloadInputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar.gz
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar.bz2
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar.lz
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar.xz
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.tar.zst
InputXSLT-1df71e9b78fd516f9902f42db733f0b02808ad50.zip
Fix `generate` problem caused by _boost_ update
i.e. the directory tree was not correctly created in all circumstances which led to both the `generate` and `write-file` test cases failing. This was combined with some accumulated changes such as the extraction of process context instantiation.
Diffstat (limited to 'src/function/read_file.cc')
-rw-r--r--src/function/read_file.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 8216034..96fa0ff 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -12,17 +12,17 @@
namespace {
inline bool isXmlFile(const boost::filesystem::path& filePath) {
- return filePath.extension() == ".xml" ||
- filePath.extension() == ".xsl";
+ return filePath.extension() == ".xml"
+ || filePath.extension() == ".xsl";
}
boost::optional<xercesc::DOMNode*> readXmlFile(
const boost::filesystem::path& filePath,
xercesc::DOMDocument* const domDocument
) {
- const xercesc::LocalFileInputSource file(
+ const xercesc::LocalFileInputSource file{
*InputXSLT::XercesStringGuard<XMLCh>(filePath.string())
- );
+ };
xercesc::XercesDOMParser parser;
parser.setDoNamespaces(true);
@@ -79,8 +79,8 @@ DomDocumentCache::document_ptr FunctionReadFile::constructDocument(
if ( auto importedNode = readXmlFile(
filePath,
- domDocument.get())
- ) {
+ domDocument.get()
+ ) ) {
result.setContent(*importedNode);
result.setAttribute("result", "success");