From 8ebea90f5cee70654ab9f1c19ed4f89dfc8ffb25 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 14 Sep 2014 19:49:15 +0200
Subject: Switched member initialization to std::make_unique * i.e. InputXSLT
 now requires a C++14 supporting compiler / standard library implementation *
 this was done while enabling the StreamInputSource to handle all kinds of
 streams ** this in turn is required to enable e.g. stdin as transformation
 source while preserving the correct filesystem context

---
 src/support/dom/document_cache.cc      |  2 +-
 src/support/dom/document_cache_item.h  |  2 +-
 src/support/error/error_capacitor.cc   |  4 ++--
 src/support/error/error_capacitor.h    |  7 +++----
 src/support/error/warning_capacitor.cc | 10 ++++++----
 src/support/error/warning_capacitor.h  |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/support')

diff --git a/src/support/dom/document_cache.cc b/src/support/dom/document_cache.cc
index c18bf96..c000aef 100644
--- a/src/support/dom/document_cache.cc
+++ b/src/support/dom/document_cache.cc
@@ -33,7 +33,7 @@ xalan::XalanDocument* DomDocumentCache::create(document_ptr&& document) {
 	std::lock_guard<std::mutex> guard(this->write_mutex_);
 
 	this->cache_.emplace(
-		new item(
+		std::make_unique<item>(
 			std::move(document)
 		)
 	);
diff --git a/src/support/dom/document_cache_item.h b/src/support/dom/document_cache_item.h
index ebc9172..df24948 100644
--- a/src/support/dom/document_cache_item.h
+++ b/src/support/dom/document_cache_item.h
@@ -17,7 +17,7 @@ class DomDocumentCache::item {
 		xalan::XalanDocument* getXalanDocument();
 
 	protected:
-		friend DomDocumentCache;
+		friend std::unique_ptr<item> std::make_unique<item>(document_ptr&&);
 
 		item(document_ptr&&);
 
diff --git a/src/support/error/error_capacitor.cc b/src/support/error/error_capacitor.cc
index cc7dd01..22ec45d 100644
--- a/src/support/error/error_capacitor.cc
+++ b/src/support/error/error_capacitor.cc
@@ -4,7 +4,7 @@ namespace InputXSLT {
 
 ErrorCapacitor::ErrorCapacitor(ErrorMultiplexer* multiplexer):
 	ErrorMultiplexer::receiver(multiplexer),
-	error_cache_(new error_cache()) { }
+	error_cache_(std::make_unique<error_cache>()) { }
 
 void ErrorCapacitor::discharge() {
 	if ( !this->error_cache_->empty() ) {
@@ -21,7 +21,7 @@ void ErrorCapacitor::receive(
 	}
 }
 
-ErrorCapacitor::exception::exception(error_cache_ptr ptr):
+ErrorCapacitor::exception::exception(std::unique_ptr<error_cache> ptr):
 	error_cache_(std::move(ptr)) { }
 
 auto ErrorCapacitor::exception::operator*() const -> const error_cache& {
diff --git a/src/support/error/error_capacitor.h b/src/support/error/error_capacitor.h
index 1c225e9..03f155d 100644
--- a/src/support/error/error_capacitor.h
+++ b/src/support/error/error_capacitor.h
@@ -12,7 +12,6 @@ class ErrorCapacitor : public ErrorMultiplexer::receiver {
 		class exception;
 
 		typedef std::vector<std::string> error_cache;
-		typedef std::unique_ptr<error_cache> error_cache_ptr;
 
 		ErrorCapacitor(ErrorMultiplexer*);
 
@@ -24,18 +23,18 @@ class ErrorCapacitor : public ErrorMultiplexer::receiver {
 		);
 
 	private:
-		error_cache_ptr error_cache_;
+		std::unique_ptr<error_cache> error_cache_;
 
 };
 
 class ErrorCapacitor::exception {
 	public:
-		exception(error_cache_ptr);
+		exception(std::unique_ptr<error_cache>);
 
 		const error_cache& operator*() const;
 
 	private:
-		error_cache_ptr error_cache_;
+		std::unique_ptr<error_cache> error_cache_;
 
 };
 
diff --git a/src/support/error/warning_capacitor.cc b/src/support/error/warning_capacitor.cc
index f8d2b99..0d98977 100644
--- a/src/support/error/warning_capacitor.cc
+++ b/src/support/error/warning_capacitor.cc
@@ -4,14 +4,16 @@ namespace InputXSLT {
 
 WarningCapacitor::WarningCapacitor(ErrorMultiplexer* multiplexer):
 	ErrorMultiplexer::receiver(multiplexer),
-	warning_cache_(new warning_cache()) { }
+	warning_cache_(std::make_unique<warning_cache>()) { }
 
 auto WarningCapacitor::discharge() -> warning_cache_ptr {
-	warning_cache_ptr tmp(std::move(this->warning_cache_));
+	warning_cache_ptr tmp(
+		std::make_unique<warning_cache>()
+	);
 
-	this->warning_cache_.reset(new warning_cache());
+	std::swap(tmp, this->warning_cache_);
 
-	return std::move(tmp);
+	return tmp;
 }
 
 void WarningCapacitor::receive(
diff --git a/src/support/error/warning_capacitor.h b/src/support/error/warning_capacitor.h
index 6b7058b..70f979b 100644
--- a/src/support/error/warning_capacitor.h
+++ b/src/support/error/warning_capacitor.h
@@ -9,7 +9,7 @@ namespace InputXSLT {
 
 class WarningCapacitor : public ErrorMultiplexer::receiver {
 	public:
-		typedef std::vector<std::string> warning_cache;
+		typedef std::vector<std::string>       warning_cache;
 		typedef std::unique_ptr<warning_cache> warning_cache_ptr;
 
 		WarningCapacitor(ErrorMultiplexer*);
-- 
cgit v1.2.3