summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lapi.c4
-rw-r--r--lgc.h6
2 files changed, 3 insertions, 7 deletions
diff --git a/lapi.c b/lapi.c
index f4a8beb4..1dacf222 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
/*
-** $Id: lapi.c,v 2.187 2013/08/16 18:55:49 roberto Exp roberto $
+** $Id: lapi.c,v 2.188 2013/08/27 18:53:35 roberto Exp roberto $
** Lua API
** See Copyright Notice in lua.h
*/
@@ -849,7 +849,7 @@ LUA_API int lua_setmetatable (lua_State *L, int objindex) {
case LUA_TTABLE: {
hvalue(obj)->metatable = mt;
if (mt) {
- luaC_objbarrierback(L, gcvalue(obj), mt);
+ luaC_objbarrier(L, gcvalue(obj), mt);
luaC_checkfinalizer(L, gcvalue(obj), mt);
}
break;
diff --git a/lgc.h b/lgc.h
index 91e241a0..88bd556a 100644
--- a/lgc.h
+++ b/lgc.h
@@ -1,5 +1,5 @@
/*
-** $Id: lgc.h,v 2.74 2013/09/11 14:09:55 roberto Exp roberto $
+** $Id: lgc.h,v 2.75 2013/09/11 14:47:08 roberto Exp roberto $
** Garbage Collector
** See Copyright Notice in lua.h
*/
@@ -128,10 +128,6 @@
if (nolocal(obj2gco(o)), isblack(obj2gco(p)) && iswhite(obj2gco(o))) \
luaC_barrier_(L,obj2gco(p),obj2gco(o)); }
-#define luaC_objbarrierback(L,p,o) \
- { if (nolocal(obj2gco(o)), isblack(obj2gco(p)) && iswhite(obj2gco(o))) \
- luaC_barrierback_(L,obj2gco(p)); }
-
#define luaC_upvalbarrier(L,uv) \
{ if (iscollectable((uv)->v) && !upisopen(uv)) \
luaC_upvalbarrier_(L,uv); }