From 07890324ed098994dd336ee00e54074e6b029014 Mon Sep 17 00:00:00 2001 From: "dcheng@chromium.org" Date: Thu, 11 Apr 2013 01:34:39 +0000 Subject: Rewrite scoped_array to scoped_ptr in rlz. This is a manual cleanup pass using sed for files which are not built on Linux. BUG=171111 Review URL: https://chromiumcodereview.appspot.com/14114002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193534 0039d316-1c4b-4281-b951-d872f2087c98 --- rlz/win/lib/machine_id_win.cc | 2 +- rlz/win/lib/process_info.cc | 2 +- rlz/win/lib/rlz_lib_win.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'rlz/win') diff --git a/rlz/win/lib/machine_id_win.cc b/rlz/win/lib/machine_id_win.cc index 8eb138a..fe0917c 100644 --- a/rlz/win/lib/machine_id_win.cc +++ b/rlz/win/lib/machine_id_win.cc @@ -41,7 +41,7 @@ bool GetSystemVolumeSerialNumber(int* number) { bool GetComputerSid(const wchar_t* account_name, SID* sid, DWORD sid_size) { static const DWORD kStartDomainLength = 128; // reasonable to start with - scoped_array domain_buffer(new wchar_t[kStartDomainLength]); + scoped_ptr domain_buffer(new wchar_t[kStartDomainLength]); DWORD domain_size = kStartDomainLength; DWORD sid_dword_size = sid_size; SID_NAME_USE sid_name_use; diff --git a/rlz/win/lib/process_info.cc b/rlz/win/lib/process_info.cc index 13612c7..9c3c516 100644 --- a/rlz/win/lib/process_info.cc +++ b/rlz/win/lib/process_info.cc @@ -40,7 +40,7 @@ HRESULT GetCurrentUser(std::wstring* name, // (Following call will fail with ERROR_INSUFFICIENT_BUFFER and give us the // required size.) - scoped_array token_user_bytes; + scoped_ptr token_user_bytes; DWORD token_user_size; DWORD token_user_size2; BOOL result = ::GetTokenInformation(token, TokenUser, NULL, 0, diff --git a/rlz/win/lib/rlz_lib_win.cc b/rlz/win/lib/rlz_lib_win.cc index e7b145e..d8b1c1e 100644 --- a/rlz/win/lib/rlz_lib_win.cc +++ b/rlz/win/lib/rlz_lib_win.cc @@ -55,7 +55,7 @@ namespace rlz_lib { template class typed_buffer_ptr { - scoped_array buffer_; + scoped_ptr buffer_; public: typed_buffer_ptr() { -- cgit v1.1