diff options
author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 22:55:20 +0000 |
---|---|---|
committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 22:55:20 +0000 |
commit | 041433ccb1d965071ef59e324f5e3123c2d0dbe0 (patch) | |
tree | 875f50c00070f6387a42ae34c10a9a8061cc3da4 /base/mac/mac_util.mm | |
parent | 08f7ecec61a0032d8b5e22b2625166f879210a9a (diff) | |
download | chromium_src-041433ccb1d965071ef59e324f5e3123c2d0dbe0.zip chromium_src-041433ccb1d965071ef59e324f5e3123c2d0dbe0.tar.gz chromium_src-041433ccb1d965071ef59e324f5e3123c2d0dbe0.tar.bz2 |
Move the implementations for the CF/NS casts to foundation_util
This should have been part of a previous CL; I missed that the header macros were *declaration* macros, not the casts themselves.
BUG=None
TEST=Existing unit tests
Review URL: http://codereview.chromium.org/6928045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac/mac_util.mm')
-rw-r--r-- | base/mac/mac_util.mm | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm index 2f93b23..dc34a8e 100644 --- a/base/mac/mac_util.mm +++ b/base/mac/mac_util.mm @@ -480,77 +480,5 @@ bool WasLaunchedAsHiddenLoginItem() { return IsHiddenLoginItem(item); } -// Definitions for the corresponding CF_TO_NS_CAST_DECL macros in mac_util.h. -#define CF_TO_NS_CAST_DEFN(TypeCF, TypeNS) \ -\ -TypeNS* CFToNSCast(TypeCF##Ref cf_val) { \ - DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \ - TypeNS* ns_val = \ - const_cast<TypeNS*>(reinterpret_cast<const TypeNS*>(cf_val)); \ - return ns_val; \ -} \ -\ -TypeCF##Ref NSToCFCast(TypeNS* ns_val) { \ - TypeCF##Ref cf_val = reinterpret_cast<TypeCF##Ref>(ns_val); \ - DCHECK(!cf_val || TypeCF##GetTypeID() == CFGetTypeID(cf_val)); \ - return cf_val; \ -} \ - -#define CF_TO_NS_MUTABLE_CAST_DEFN(name) \ -CF_TO_NS_CAST_DEFN(CF##name, NS##name) \ -\ -NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val) { \ - DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \ - NSMutable##name* ns_val = reinterpret_cast<NSMutable##name*>(cf_val); \ - return ns_val; \ -} \ -\ -CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val) { \ - CFMutable##name##Ref cf_val = \ - reinterpret_cast<CFMutable##name##Ref>(ns_val); \ - DCHECK(!cf_val || CF##name##GetTypeID() == CFGetTypeID(cf_val)); \ - return cf_val; \ -} \ - -CF_TO_NS_MUTABLE_CAST_DEFN(Array); -CF_TO_NS_MUTABLE_CAST_DEFN(AttributedString); -CF_TO_NS_CAST_DEFN(CFCalendar, NSCalendar); -CF_TO_NS_MUTABLE_CAST_DEFN(CharacterSet); -CF_TO_NS_MUTABLE_CAST_DEFN(Data); -CF_TO_NS_CAST_DEFN(CFDate, NSDate); -CF_TO_NS_MUTABLE_CAST_DEFN(Dictionary); -CF_TO_NS_CAST_DEFN(CFError, NSError); -CF_TO_NS_CAST_DEFN(CFLocale, NSLocale); -CF_TO_NS_CAST_DEFN(CFNumber, NSNumber); -CF_TO_NS_CAST_DEFN(CFRunLoopTimer, NSTimer); -CF_TO_NS_CAST_DEFN(CFTimeZone, NSTimeZone); -CF_TO_NS_MUTABLE_CAST_DEFN(Set); -CF_TO_NS_CAST_DEFN(CFReadStream, NSInputStream); -CF_TO_NS_CAST_DEFN(CFWriteStream, NSOutputStream); -CF_TO_NS_MUTABLE_CAST_DEFN(String); -CF_TO_NS_CAST_DEFN(CFURL, NSURL); - } // namespace mac } // namespace base - -std::ostream& operator<<(std::ostream& o, const CFStringRef string) { - return o << base::SysCFStringRefToUTF8(string); -} - -std::ostream& operator<<(std::ostream& o, const CFErrorRef err) { - base::mac::ScopedCFTypeRef<CFStringRef> desc(CFErrorCopyDescription(err)); - base::mac::ScopedCFTypeRef<CFDictionaryRef> user_info( - CFErrorCopyUserInfo(err)); - CFStringRef errorDesc = NULL; - if (user_info.get()) { - errorDesc = reinterpret_cast<CFStringRef>( - CFDictionaryGetValue(user_info.get(), kCFErrorDescriptionKey)); - } - o << "Code: " << CFErrorGetCode(err) - << " Domain: " << CFErrorGetDomain(err) - << " Desc: " << desc.get(); - if(errorDesc) { - o << "(" << errorDesc << ")"; - } - return o; -} |