averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a build break on linux for swift_retain returns no reference.

Browse Source 
Swift SVN r32059
This commit is contained in:
Xin Tong
2015-09-18 01:54:20 +00:00
parent 4e46dacc3d
commit 36f04d1cd6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stdlib/public/runtime/ErrorObject.cpp
View File

@@ -95,7 +95,8 @@ swift::swift_getErrorValue(const SwiftError *errorObject,
SwiftError * SwiftError *
swift::swift_errorRetain(SwiftError *object) { swift::swift_errorRetain(SwiftError *object) {
return static_cast<SwiftError*>(swift_retain(object)); swift_retain(object);
return static_cast<SwiftError*>(object);
} }
void swift::swift_errorRelease(SwiftError *object) { void swift::swift_errorRelease(SwiftError *object) {

6
stdlib/public/runtime/SwiftObject.mm
View File

@@ -637,7 +637,8 @@ void *swift::swift_bridgeObjectRetain(void *object) {
} }
return objc_retain(static_cast<id>(objectRef)); return objc_retain(static_cast<id>(objectRef));
#else #else
return swift_retain(static_cast<HeapObject *>(objectRef)); swift_retain(static_cast<HeapObject *>(objectRef));
return static_cast<HeapObject *>(objectRef);
#endif #endif
} }
@@ -676,7 +677,8 @@ void *swift::swift_bridgeObjectRetain_n(void *object, int n) {
objc_ret = objc_retain(static_cast<id>(objectRef)); objc_ret = objc_retain(static_cast<id>(objectRef));
return objc_ret; return objc_ret;
#else #else
return swift_retain_n(static_cast<HeapObject *>(objectRef), n); swift_retain_n(static_cast<HeapObject *>(objectRef), n);
return static_cast<HeapObject *>(objectRef);
#endif #endif
} }