From 2acbf25f674364861ca2125c1c26d6c40f431072 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Wed, 23 Oct 2013 07:18:39 +0000 Subject: [PATCH] Fix leaks to global namespace in OvalePool and OvalePoolGC. git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@1089 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvalePool.lua | 17 +++++++++-------- OvalePoolGC.lua | 18 +++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/OvalePool.lua b/OvalePool.lua index e7222f6..e150157 100644 --- a/OvalePool.lua +++ b/OvalePool.lua @@ -16,6 +16,7 @@ Ovale.OvalePool = OvalePool local assert = assert local setmetatable = setmetatable local tinsert = table.insert +local tostring = tostring local tremove = table.remove local wipe = table.wipe -- @@ -26,16 +27,16 @@ OvalePool.pool = nil OvalePool.size = 0 OvalePool.unused = 0 OvalePool.__index = OvalePool -do - setmetatable(OvalePool, { __call = function(_, ...) return NewPool(...) end }) -end -- -- -function NewPool(...) - local obj = setmetatable({ name = ... }, OvalePool) - obj:Reset() - return obj +do + local function NewPool(...) + local obj = setmetatable({ name = ... }, OvalePool) + obj:Reset() + return obj + end + setmetatable(OvalePool, { __call = function(_, ...) return NewPool(...) end }) end -- @@ -77,6 +78,6 @@ function OvalePool:Reset() end function OvalePool:Debug() - Ovale:FormatPrint("Pool %s has size %d with %d item(s).", self.name, self.size, self.unused) + Ovale:FormatPrint("Pool %s has size %d with %d item(s).", tostring(self.name), self.size, self.unused) end -- diff --git a/OvalePoolGC.lua b/OvalePoolGC.lua index 7a1259b..a0ded75 100644 --- a/OvalePoolGC.lua +++ b/OvalePoolGC.lua @@ -14,6 +14,7 @@ Ovale.OvalePoolGC = OvalePoolGC -- local setmetatable = setmetatable +local tostring = tostring -- -- @@ -22,17 +23,16 @@ OvalePoolGC.pool = nil OvalePoolGC.size = 0 OvalePoolGC.unused = 0 OvalePoolGC.__index = OvalePoolGC -do - setmetatable(OvalePoolGC, { __call = function(_, ...) return NewPool(...) end }) -end - -- -- -function NewPool(...) - local obj = setmetatable({ name = ... }, OvalePoolGC) - obj:Reset() - return obj +do + local function NewPool(...) + local obj = setmetatable({ name = ... }, OvalePoolGC) + obj:Reset() + return obj + end + setmetatable(OvalePoolGC, { __call = function(_, ...) return NewPool(...) end }) end -- @@ -53,6 +53,6 @@ function OvalePoolGC:Reset() end function OvalePoolGC:Debug() - Ovale:FormatPrint("Pool %s has size %d.", self.name, self.size) + Ovale:FormatPrint("Pool %s has size %d.", tostring(self.name), self.size) end -- -- 1.7.9.5