aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/function/base.h6
-rw-r--r--src/function/external_command.cc6
-rw-r--r--src/function/read_file.cc4
-rw-r--r--src/support/error/error_multiplexer.cc4
-rw-r--r--src/support/filesystem_context.cc2
-rw-r--r--src/support/include_entity_resolver.cc4
-rw-r--r--src/support/xerces_string_guard.h2
7 files changed, 14 insertions, 14 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);
diff --git a/src/support/error/error_multiplexer.cc b/src/support/error/error_multiplexer.cc
index bbf0e71..78f0a4b 100644
--- a/src/support/error/error_multiplexer.cc
+++ b/src/support/error/error_multiplexer.cc
@@ -14,7 +14,7 @@ namespace {
using InputXSLT::XercesStringGuard;
using InputXSLT::ErrorMultiplexer;
-inline std::string getMessage(const xercesc::SAXParseException& exception) {
+std::string getMessage(const xercesc::SAXParseException& exception) {
return (
std::string(*XercesStringGuard<char>(exception.getMessage()))
+ ". (Occurred in entity '"
@@ -27,7 +27,7 @@ inline std::string getMessage(const xercesc::SAXParseException& exception) {
);
}
-inline ErrorMultiplexer::error_type toErrorType(
+ErrorMultiplexer::error_type toErrorType(
const xalan::ProblemListenerBase::eClassification classification) {
switch ( classification ) {
case xalan::ProblemListenerBase::eClassification::eMessage ||
diff --git a/src/support/filesystem_context.cc b/src/support/filesystem_context.cc
index b726f1b..5221188 100644
--- a/src/support/filesystem_context.cc
+++ b/src/support/filesystem_context.cc
@@ -9,7 +9,7 @@ namespace {
const std::string workingDirectory(".");
-inline boost::filesystem::path determineBasePath(
+boost::filesystem::path determineBasePath(
const boost::filesystem::path& path) {
const boost::filesystem::path basePath(
boost::filesystem::is_directory(path) ? path : path.parent_path()
diff --git a/src/support/include_entity_resolver.cc b/src/support/include_entity_resolver.cc
index 197b217..c628258 100644
--- a/src/support/include_entity_resolver.cc
+++ b/src/support/include_entity_resolver.cc
@@ -15,8 +15,8 @@ boost::optional<boost::filesystem::path> extractFilePath(
const std::size_t closingDelimiter = rawPath.find_last_of(']');
if ( leadingDelimiter != std::string::npos &&
- closingDelimiter != std::string::npos &&
- leadingDelimiter < closingDelimiter ) {
+ closingDelimiter != std::string::npos &&
+ leadingDelimiter < closingDelimiter ) {
return boost::make_optional(
boost::filesystem::path(
rawPath.substr(
diff --git a/src/support/xerces_string_guard.h b/src/support/xerces_string_guard.h
index 7b9517a..9c35449 100644
--- a/src/support/xerces_string_guard.h
+++ b/src/support/xerces_string_guard.h
@@ -28,7 +28,7 @@ class XercesStringGuard {
);
}
- inline const Type* operator*() const {
+ const Type* operator*() const {
return this->string_;
}