From 1df71e9b78fd516f9902f42db733f0b02808ad50 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Tue, 5 Jan 2016 21:17:42 +0100 Subject: 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. --- src/function/read_file.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/function/read_file.cc') 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 readXmlFile( const boost::filesystem::path& filePath, xercesc::DOMDocument* const domDocument ) { - const xercesc::LocalFileInputSource file( + const xercesc::LocalFileInputSource file{ *InputXSLT::XercesStringGuard(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"); -- cgit v1.2.3