From df0ca6c858762b101bf424ff6c0522409fa195fc Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Sun, 17 Oct 2010 04:09:06 +0000 Subject: Move scoped_cftyperef from base to base/mac, use the new namespace, and name it properly (scoped_cftyperef -> ScopedCFTypeRef). TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3855001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98 --- base/scoped_nsobject.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'base/scoped_nsobject.h') diff --git a/base/scoped_nsobject.h b/base/scoped_nsobject.h index 1b40ade..a9783e0 100644 --- a/base/scoped_nsobject.h +++ b/base/scoped_nsobject.h @@ -41,10 +41,10 @@ class scoped_nsobject { void reset(NST* object = nil) { // We intentionally do not check that object != object_ as the caller must - // already have an ownership claim over whatever it gives to scoped_nsobject - // and scoped_cftyperef, whether it's in the constructor or in a call to - // reset(). In either case, it relinquishes that claim and the scoper - // assumes it. + // already have an ownership claim over whatever it gives to + // scoped_nsobject and ScopedCFTypeRef, whether it's in the constructor or + // in a call to reset(). In either case, it relinquishes that claim and + // the scoper assumes it. [object_ release]; object_ = object; } @@ -114,10 +114,10 @@ class scoped_nsobject { void reset(id object = nil) { // We intentionally do not check that object != object_ as the caller must - // already have an ownership claim over whatever it gives to scoped_nsobject - // and scoped_cftyperef, whether it's in the constructor or in a call to - // reset(). In either case, it relinquishes that claim and the scoper - // assumes it. + // already have an ownership claim over whatever it gives to + // scoped_nsobject and ScopedCFTypeRef, whether it's in the constructor or + // in a call to reset(). In either case, it relinquishes that claim and + // the scoper assumes it. [object_ release]; object_ = object; } -- cgit v1.1