summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2015-02-25 15:11:52 +0000
committerDaniel Kolesa <d.kolesa@samsung.com>2015-02-25 15:11:52 +0000
commit212571c40618f0b3a1c336d73548fd021e6cd278 (patch)
tree7578284882d7aa5a841263392a857f8f0d270a8f /src/bindings
parent4ecedc519866cdb56fc5d566cea17deb3401a01f (diff)
elua: guarantee multiple inheritance availability on any object
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/luajit/eina/accessor.lua2
-rw-r--r--src/bindings/luajit/eo.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bindings/luajit/eina/accessor.lua b/src/bindings/luajit/eina/accessor.lua
index 7634590d0e..55afa62427 100644
--- a/src/bindings/luajit/eina/accessor.lua
+++ b/src/bindings/luajit/eina/accessor.lua
@@ -102,7 +102,7 @@ M.Accessor = util.Readonly_Object:clone {
102 clone = function(self) 102 clone = function(self)
103 self = dgetmt(self) 103 self = dgetmt(self)
104 if not self.__accessor then return nil end 104 if not self.__accessor then return nil end
105 return self.__proto(self.__accessor:clone()) 105 return self.__protos[1](self.__accessor:clone())
106 end, 106 end,
107 107
108 data_get = function(self, pos) 108 data_get = function(self, pos)
diff --git a/src/bindings/luajit/eo.lua b/src/bindings/luajit/eo.lua
index 9067a057b0..8ebbb383e4 100644
--- a/src/bindings/luajit/eo.lua
+++ b/src/bindings/luajit/eo.lua
@@ -203,7 +203,7 @@ local mixin_tbl = function(cl, mixin, field)
203 local clt = rawget(cl, field) 203 local clt = rawget(cl, field)
204 if not clt then 204 if not clt then
205 -- will always succeed, even if it means deep lookups 205 -- will always succeed, even if it means deep lookups
206 clt = cl.__proto[field]:clone() 206 clt = cl.__protos[1][field]:clone()
207 rawset(cl, field, clt) 207 rawset(cl, field, clt)
208 end 208 end
209 for k, v in pairs(mxt) do clt[k] = v end 209 for k, v in pairs(mxt) do clt[k] = v end