Permalink
Browse files

fix silly merge

  • Loading branch information...
1 parent a39a2ac commit 3c39b207560aca4378cbb79a15c694b84c4f8eb2 Tu Yimin committed Mar 19, 2013
Showing with 0 additions and 11 deletions.
  1. +0 −3 WaxPatch/WaxPatch/wax/wax_gc.m
  2. +0 −4 WaxPatch/WaxPatch/wax/wax_instance.h
  3. +0 −4 WaxPatch/WaxPatch/wax/wax_instance.m
@@ -48,10 +48,7 @@ + (void)cleanupUnusedObject {
lua_rawset(L, -4); // Clear it!
if(instanceUserdata->waxRetain) {
[instanceUserdata->instance release];
-<<<<<<< HEAD
-=======
instanceUserdata->waxRetain = NO; // fix gc bad exec
->>>>>>> fix gc issue
}
}
}
@@ -20,11 +20,7 @@ typedef struct _wax_instance_userdata {
BOOL isClass;
Class isSuper; // isSuper not only stores whether the class is a super, but it also contains the value of the next superClass.
BOOL actAsSuper; // It only acts like a super once, when it is called for the first time.
-<<<<<<< HEAD
- BOOL waxRetain; // retained by wax, release instance when wax_gc
-=======
BOOL waxRetain; // TODO: need release instance when gc
->>>>>>> fix gc issue
} wax_instance_userdata;
int luaopen_wax_instance(lua_State *L);
@@ -220,11 +220,7 @@ BOOL wax_instance_pushFunction(lua_State *L, id self, SEL selector) {
if (lua_isnil(L, -1)) {
// TODO:
// quick and dirty solution to let obj-c call directly into lua
-<<<<<<< HEAD
- // to avoid obj-c leak, we release instance when wax_gc
-=======
// cause a obj-c leak, should we release it later?
->>>>>>> fix gc issue
wax_instance_userdata *data = wax_instance_create(L, self, NO);
data->waxRetain = YES;
// [self release];

0 comments on commit 3c39b20

Please sign in to comment.