admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove calls to rtc::scoped_ptr::accept

Browse Source 
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}
This commit is contained in:
kwiberg 2016-03-29 10:16:34 -07:00 committed by Commit bot
parent 57d5a2e4df
commit 345807e599
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/base/win32regkey.cc
View File

@ -143,9 +143,10 @@ HRESULT RegKey::GetValue(const wchar_t* full_key_name,
ASSERT(full_key_name != NULL);
DWORD byte_count = 0;
scoped_ptr<byte[]> 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<byte[]> 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<byte[]> 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<byte[]> 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<wchar_t[]> 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<wchar_t[]> buffer(buffer_raw);
if (SUCCEEDED(hr)) {
value->assign(buffer.get());
}