diff options
Diffstat (limited to 'src/function')
| -rw-r--r-- | src/function/base.h | 6 | ||||
| -rw-r--r-- | src/function/external_command.cc | 6 | ||||
| -rw-r--r-- | src/function/read_file.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/function/base.h b/src/function/base.h index e2239e7..fe1e821 100644 --- a/src/function/base.h +++ b/src/function/base.h @@ -96,7 +96,7 @@ class FunctionBase : public xalan::Function { if ( minimum_parameter_count == maximum_parameter_count ) { result.assign(std::string( startText - + std::to_string(minimum_parameter_count) + + std::to_string(minimum_parameter_count) + endText ).data()); } else { @@ -114,7 +114,7 @@ class FunctionBase : public xalan::Function { } template <std::size_t... Index> - inline xalan::XalanDocument* callConstructDocument( + xalan::XalanDocument* callConstructDocument( const XObjectArgVectorType& parameters, Sequence<Index...> ) const { @@ -136,7 +136,7 @@ class FunctionBase : public xalan::Function { ); } - inline void validateParameters( + void validateParameters( const XObjectArgVectorType& parameters, xalan::XPathExecutionContext& executionContext, xalan::XalanNode* context, diff --git a/src/function/external_command.cc b/src/function/external_command.cc index e60737d..606ff8f 100644 --- a/src/function/external_command.cc +++ b/src/function/external_command.cc @@ -29,7 +29,7 @@ inline bool isWrappedOutput(const XMLCh* nodeName) { ); } -inline std::unique_ptr<std::stringstream> readOutput( +std::unique_ptr<std::stringstream> readOutput( boost::process::pistream& outputStream) { const std::string rawOutput( (std::istreambuf_iterator<char>(outputStream)), @@ -47,7 +47,7 @@ inline std::unique_ptr<std::stringstream> readOutput( } } -inline boost::optional<xercesc::DOMNode*> importDocumentElement( +boost::optional<xercesc::DOMNode*> importDocumentElement( std::stringstream* const outputStream, xercesc::DOMDocument* const domDocument ) { @@ -81,7 +81,7 @@ DomDocumentCache::document_ptr FunctionExternalCommand::constructDocument( ); boost::process::context context; - context.environment = boost::process::self::get_environment(); + context.environment = boost::process::self::get_environment(); context.stdout_behavior = boost::process::capture_stream(); context.stdin_behavior = boost::process::capture_stream(); context.work_directory = boost::filesystem::canonical( diff --git a/src/function/read_file.cc b/src/function/read_file.cc index bbc8315..8216034 100644 --- a/src/function/read_file.cc +++ b/src/function/read_file.cc @@ -21,7 +21,7 @@ boost::optional<xercesc::DOMNode*> readXmlFile( xercesc::DOMDocument* const domDocument ) { const xercesc::LocalFileInputSource file( - *InputXSLT::XercesStringGuard<XMLCh>(filePath.string().data()) + *InputXSLT::XercesStringGuard<XMLCh>(filePath.string()) ); xercesc::XercesDOMParser parser; @@ -79,7 +79,7 @@ DomDocumentCache::document_ptr FunctionReadFile::constructDocument( if ( auto importedNode = readXmlFile( filePath, - domDocument.get()) + domDocument.get()) ) { result.setContent(*importedNode); |