Replaced std::pair<bool, *> with the more convenient boost::optional<*>

* InputXSLT is dependent on boost anyway, so there is no argument to be made to emulate boost::optional using std::pair

2 files changed, 8 insertions, 18 deletions

diff --git a/src/function/read_file.cc b/src/function/read_file.cc
index 85f834d..1a870a6 100644
--- a/src/function/read_file.cc
+++ b/src/function/read_file.cc
@@ -28,18 +28,13 @@ xercesc::DOMDocument* FunctionReadFile::constructDocument(
 	const FilesystemContext& fsContext,
 	const FunctionBase::parameter_tuple& parameters
 ) {
-	boost::filesystem::path filePath(
-		fsContext.resolve(std::get<0>(parameters))
-	);
+	const std::string& rawPath = std::get<0>(parameters);
+	boost::filesystem::path filePath(fsContext.resolve(rawPath));
 
 	if ( !(boost::filesystem::exists(filePath) &&
 	       boost::filesystem::is_regular_file(filePath)) ) {
-		auto resolvedPath = this->include_resolver_->resolve(
-			std::get<0>(parameters)
-		);
-
-		if ( resolvedPath.first ) {
-			filePath = resolvedPath.second;
+		if ( auto resolvedPath = this->include_resolver_->resolve(rawPath) ) {
+			filePath = *resolvedPath;
 		}
 	}
 
diff --git a/src/function/read_xml_file.cc b/src/function/read_xml_file.cc
index b9246e6..4eb44e5 100644
--- a/src/function/read_xml_file.cc
+++ b/src/function/read_xml_file.cc
@@ -38,18 +38,13 @@ xercesc::DOMDocument* FunctionReadXmlFile::constructDocument(
 	const FilesystemContext& fsContext,
 	const FunctionBase::parameter_tuple& parameters
 ) {
-	boost::filesystem::path filePath(
-		fsContext.resolve(std::get<0>(parameters))
-	);
+	const std::string& rawPath = std::get<0>(parameters);
+	boost::filesystem::path filePath(fsContext.resolve(rawPath));
 
 	if ( !(boost::filesystem::exists(filePath) &&
 	       boost::filesystem::is_regular_file(filePath)) ) {
-		auto resolvedPath = this->include_resolver_->resolve(
-			std::get<0>(parameters)
-		);
-
-		if ( resolvedPath.first ) {
-			filePath = resolvedPath.second;
+		if ( auto resolvedPath = this->include_resolver_->resolve(rawPath) ) {
+			filePath = *resolvedPath;
 		}
 	}