Skip to content

Commit 4f35c07

Browse files
committed
Merge pull request #251 from macvim-dev/fix/__bridge
No need to use __bridge for non-ARC
2 parents 1ad7413 + 27ef23e commit 4f35c07

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/MacVim/MMBackend.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,12 +1689,12 @@ - (void *)addChannel:(channel_T *)channel part:(int)part
16891689
{
16901690
MMChannel *mmChannel =
16911691
[[MMChannel alloc] initWithChannel:channel part:part];
1692-
return (__bridge void *)mmChannel;
1692+
return (void *)mmChannel;
16931693
}
16941694

16951695
- (void)removeChannel:(void *)cookie
16961696
{
1697-
MMChannel *mmChannel = (__bridge MMChannel *)cookie;
1697+
MMChannel *mmChannel = (MMChannel *)cookie;
16981698
[mmChannel release];
16991699
}
17001700

@@ -3428,7 +3428,7 @@ static void socketReadCallback(CFSocketRef s,
34283428
const void *data,
34293429
void *info)
34303430
{
3431-
MMChannel *mmChannel = (__bridge MMChannel *)info;
3431+
MMChannel *mmChannel = (MMChannel *)info;
34323432
[mmChannel read];
34333433
}
34343434

@@ -3441,7 +3441,7 @@ - (id)initWithChannel:(channel_T *)c part:(int)p
34413441
part = p;
34423442

34433443
// Tell CFRunLoop that we are interested in channel socket input.
3444-
CFSocketContext ctx = {0, (__bridge void *)self, NULL, NULL, NULL};
3444+
CFSocketContext ctx = {0, (void *)self, NULL, NULL, NULL};
34453445
socket = CFSocketCreateWithNative(kCFAllocatorDefault,
34463446
channel->ch_part[part].ch_fd,
34473447
kCFSocketReadCallBack,

0 commit comments

Comments
 (0)