Use unique_ref instead of unique_ptr

smessmer · smessmer · commit 4ed555b422f8 · 2018-09-17T20:12:23.000-07:00
diff --git a/src/cpp-utils/network/WinHttpClient.cpp b/src/cpp-utils/network/WinHttpClient.cpp
@@ -211,13 +211,13 @@ namespace cpputils {
 	};
 
 	namespace {
-		std::unique_ptr<WinHttpSession> create_session() {
+		cpputils::unique_ref<WinHttpSession> create_session() {
 			HttpHandleRAII session_handle = WinHttpOpen(L"cpputils::HttpClient", WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
 			if(nullptr == session_handle.handle) {
 				throw std::runtime_error("Error calling WinHttpOpen. Error code: " + std::to_string(GetLastError()));
 			}
 
-			return std::make_unique<WinHttpSession>(std::move(session_handle));
+			return cpputils::make_unique<_refWinHttpSession>(std::move(session_handle));
 		}
 	}
 
diff --git a/src/cpp-utils/network/WinHttpClient.h b/src/cpp-utils/network/WinHttpClient.h
@@ -6,6 +6,7 @@
 
 #include "HttpClient.h"
 #include "../macros.h"
+#include "../pointer/unique_ref.h"
 
 namespace cpputils {
 
@@ -19,7 +20,7 @@ namespace cpputils {
 		std::string get(const std::string &url, boost::optional<long> timeoutMsec = boost::none) override;
 
 	private:
-		std::unique_ptr<WinHttpSession> session_;
+		unique_ref<WinHttpSession> session_;
 
 		DISALLOW_COPY_AND_ASSIGN(WinHttpClient);
 	};

Original file line number	Diff line number	Diff line change
`@@ -211,13 +211,13 @@ namespace cpputils {`
`211`	`211`	`};`
`212`	`212`
`213`	`213`	`namespace {`
`214`		`- std::unique_ptr<WinHttpSession> create_session() {`
	`214`	`+ cpputils::unique_ref<WinHttpSession> create_session() {`
`215`	`215`	`HttpHandleRAII session_handle = WinHttpOpen(L"cpputils::HttpClient", WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);`
`216`	`216`	`if(nullptr == session_handle.handle) {`
`217`	`217`	`throw std::runtime_error("Error calling WinHttpOpen. Error code: " + std::to_string(GetLastError()));`
`218`	`218`	`}`
`219`	`219`
`220`		`- return std::make_unique<WinHttpSession>(std::move(session_handle));`
	`220`	`+ return cpputils::make_unique<_refWinHttpSession>(std::move(session_handle));`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`