Title: [149789] trunk/Source/WebCore
- Revision
- 149789
- Author
- [email protected]
- Date
- 2013-05-08 20:52:18 -0700 (Wed, 08 May 2013)
Log Message
BUILD FIX: Don't use adoptCF() with NSDictionary * object
Fixes the following build failure:
In file included from Source/WebCore/platform/network/mac/ResourceErrorMac.mm:27:
In file included from Source/WebCore/platform/network/cf/ResourceError.h:31:
/usr/local/include/wtf/RetainPtr.h:81:13: error: static_assert failed "Don't use adoptCF with Objective-C pointer types, use adoptNS."
static_assert(!std::is_convertible<T, id>::value, "Don't use adoptCF with Objective-C pointer types, use adoptNS.");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/usr/local/include/wtf/RetainPtr.h:274:16: note: in instantiation of member function 'WTF::RetainPtr<NSDictionary *>::RetainPtr' requested here
return RetainPtr<T>(AdoptCF, o);
^
Source/WebCore/platform/network/mac/ResourceErrorMac.mm:214:44: note: in instantiation of function template specialization 'WTF::adoptCF<NSDictionary *>' requested here
RetainPtr<NSDictionary> userInfo = adoptCF((NSDictionary *) CFErrorCopyUserInfo(error));
^
1 error generated.
* platform/network/mac/ResourceErrorMac.mm:
(WebCore::ResourceError::nsError): Switch from adoptCF() to
adoptNS(). This is in USE(CFNETWORK) code, so it's not
exercised on the Mac.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149788 => 149789)
--- trunk/Source/WebCore/ChangeLog 2013-05-09 03:12:41 UTC (rev 149788)
+++ trunk/Source/WebCore/ChangeLog 2013-05-09 03:52:18 UTC (rev 149789)
@@ -1,3 +1,27 @@
+2013-05-08 David Kilzer <[email protected]>
+
+ BUILD FIX: Don't use adoptCF() with NSDictionary * object
+
+ Fixes the following build failure:
+
+ In file included from Source/WebCore/platform/network/mac/ResourceErrorMac.mm:27:
+ In file included from Source/WebCore/platform/network/cf/ResourceError.h:31:
+ /usr/local/include/wtf/RetainPtr.h:81:13: error: static_assert failed "Don't use adoptCF with Objective-C pointer types, use adoptNS."
+ static_assert(!std::is_convertible<T, id>::value, "Don't use adoptCF with Objective-C pointer types, use adoptNS.");
+ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ /usr/local/include/wtf/RetainPtr.h:274:16: note: in instantiation of member function 'WTF::RetainPtr<NSDictionary *>::RetainPtr' requested here
+ return RetainPtr<T>(AdoptCF, o);
+ ^
+ Source/WebCore/platform/network/mac/ResourceErrorMac.mm:214:44: note: in instantiation of function template specialization 'WTF::adoptCF<NSDictionary *>' requested here
+ RetainPtr<NSDictionary> userInfo = adoptCF((NSDictionary *) CFErrorCopyUserInfo(error));
+ ^
+ 1 error generated.
+
+ * platform/network/mac/ResourceErrorMac.mm:
+ (WebCore::ResourceError::nsError): Switch from adoptCF() to
+ adoptNS(). This is in USE(CFNETWORK) code, so it's not
+ exercised on the Mac.
+
2013-05-08 Ryosuke Niwa <[email protected]>
Remove Editor::setSelectionOffsets
Modified: trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm (149788 => 149789)
--- trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm 2013-05-09 03:12:41 UTC (rev 149788)
+++ trunk/Source/WebCore/platform/network/mac/ResourceErrorMac.mm 2013-05-09 03:52:18 UTC (rev 149789)
@@ -76,7 +76,7 @@
if (m_platformError) {
CFErrorRef error = m_platformError.get();
- RetainPtr<NSDictionary> userInfo = adoptCF((NSDictionary *) CFErrorCopyUserInfo(error));
+ RetainPtr<NSDictionary> userInfo = adoptNS((NSDictionary *) CFErrorCopyUserInfo(error));
m_platformNSError = adoptNS([[NSError alloc] initWithDomain:(NSString *)CFErrorGetDomain(error) code:CFErrorGetCode(error) userInfo:userInfo.get()]);
return m_platformNSError.get();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
