From 345807e599f89de716ad84c0cae23a16dbbca705 Mon Sep 17 00:00:00 2001 From: kwiberg Date: Tue, 29 Mar 2016 10:16:34 -0700 Subject: [PATCH] Remove calls to rtc::scoped_ptr::accept It'll go away soon, when rtc::scoped_ptr becomes a type alias for std::unique_ptr. BUG=webrtc:5520 Review URL: https://codereview.webrtc.org/1837693002 Cr-Commit-Position: refs/heads/master@{#12144} --- webrtc/base/win32regkey.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/webrtc/base/win32regkey.cc b/webrtc/base/win32regkey.cc index ccf931c14a..c53386fffe 100644 --- a/webrtc/base/win32regkey.cc +++ b/webrtc/base/win32regkey.cc @@ -143,9 +143,10 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name, ASSERT(full_key_name != NULL); DWORD byte_count = 0; - scoped_ptr buffer; + byte* buffer_raw = nullptr; HRESULT hr = GetValueStaticHelper(full_key_name, value_name, - REG_BINARY, buffer.accept(), &byte_count); + REG_BINARY, &buffer_raw, &byte_count); + scoped_ptr buffer(buffer_raw); if (SUCCEEDED(hr)) { ASSERT(byte_count == sizeof(*value)); if (byte_count == sizeof(*value)) { @@ -162,9 +163,10 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name, ASSERT(full_key_name != NULL); DWORD byte_count = 0; - scoped_ptr buffer; + byte* buffer_raw = nullptr; HRESULT hr = GetValueStaticHelper(full_key_name, value_name, - REG_BINARY, buffer.accept(), &byte_count); + REG_BINARY, &buffer_raw, &byte_count); + scoped_ptr buffer(buffer_raw); if (SUCCEEDED(hr)) { ASSERT(byte_count == sizeof(*value)); if (byte_count == sizeof(*value)) { @@ -189,8 +191,9 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name, ASSERT(full_key_name != NULL); ASSERT(value != NULL); - scoped_ptr buffer; - HRESULT hr = RegKey::GetValue(full_key_name, value_name, buffer.accept()); + wchar_t* buffer_raw = nullptr; + HRESULT hr = RegKey::GetValue(full_key_name, value_name, &buffer_raw); + scoped_ptr buffer(buffer_raw); if (SUCCEEDED(hr)) { value->assign(buffer.get()); }