Changeset 221097 in webkit
- Timestamp:
- Aug 23, 2017 1:14:37 PM (7 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm
r217108 r221097 501 501 return nullptr; 502 502 } 503 return (JSObjectRef)result;503 return const_cast<JSObjectRef>(result); 504 504 } 505 505 -
trunk/Source/JavaScriptCore/API/tests/CurrentThisInsideBlockGetterTest.mm
r159138 r221097 83 83 NSMutableDictionary *privateProperties = [@{ @"constructorDescriptor" : constructorDescriptor } mutableCopy]; 84 84 JSGlobalContextRef ctx = [context JSGlobalContextRef]; 85 JSObjectRef constructorRef = JSObjectMake(ctx, ConstructorClass(), (void *)CFBridgingRetain(privateProperties));85 JSObjectRef constructorRef = JSObjectMake(ctx, ConstructorClass(), const_cast<void*>(CFBridgingRetain(privateProperties))); 86 86 JSValue *constructor = [JSValue valueWithJSValueRef:constructorRef inContext:context]; 87 87 return constructor; -
trunk/Source/JavaScriptCore/ChangeLog
r221084 r221097 1 2017-08-23 David Kilzer <ddkilzer@apple.com> 2 3 Fix -Wcast-qual warnings in JavaScriptCore with new clang compiler 4 <https://webkit.org/b/175889> 5 <rdar://problem/33667497> 6 7 Reviewed by Mark Lam. 8 9 * API/ObjCCallbackFunction.mm: 10 (JSC::objCCallbackFunctionCallAsConstructor): Use 11 const_cast<JSObjectRef>() since JSValueRef is const while 12 JSObjectRef is not. 13 * API/tests/CurrentThisInsideBlockGetterTest.mm: 14 (+[JSValue valueWithConstructorDescriptor:inContext:]): Use 15 const_cast<void*>() since JSObjectMake() takes a void*, but 16 CFBridgingRetain() returns const void*. 17 1 18 2017-08-23 Robin Morisset <rmorisset@apple.com> 2 19
Note: See TracChangeset
for help on using the changeset viewer.