diff options
| author | Olly Betts <olly@survex.com> | 2022-10-20 10:43:49 +1300 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2022-10-20 10:43:49 +1300 |
| commit | f75adcecac59c96e0a45e37a6fe914d3a9505cf2 (patch) | |
| tree | 70bcdcd159c5434a2966684a4bb97471e5b073d6 | |
| parent | f40658c2d04feeb3803cf0f3d34d915163b39b10 (diff) | |
| download | swig-f75adcecac59c96e0a45e37a6fe914d3a9505cf2.tar.gz | |
Revert "[Lua] Fix type resolution between SWIG-wrapped modules"
This reverts commit a5bc48afeac0b33631b7aeb544e6a23d99b54bf8.
| -rw-r--r-- | CHANGES.current | 4 | ||||
| -rw-r--r-- | Examples/test-suite/lua/mod_runme.lua | 12 | ||||
| -rw-r--r-- | Lib/lua/luarun.swg | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/CHANGES.current b/CHANGES.current index ffebbac46..0a23158a2 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -7,10 +7,6 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/ Version 4.1.0 (in progress) =========================== -2022-10-19: olly - [Lua] #2126 Fix type resolution between multiple SWIG-wrapped - modules. - 2022-10-17: wsfulton [R] #2385 Add support for std::vector<std::vector<std::string>>. diff --git a/Examples/test-suite/lua/mod_runme.lua b/Examples/test-suite/lua/mod_runme.lua deleted file mode 100644 index 444a61b20..000000000 --- a/Examples/test-suite/lua/mod_runme.lua +++ /dev/null @@ -1,12 +0,0 @@ -require("import") -- the import fn -import("mod_a") -- import lib -import("mod_b") -- import lib - --- catch "undefined" global variables -local env = _ENV -- Lua 5.2 -if not env then env = getfenv () end -- Lua 5.1 -setmetatable(env, {__index=function (t,i) error("undefined global variable `"..i.."'",2) end}) - -c = mod_b.C() -d = mod_b.D() -d:DoSomething(c) diff --git a/Lib/lua/luarun.swg b/Lib/lua/luarun.swg index f47fd4fac..909a5229c 100644 --- a/Lib/lua/luarun.swg +++ b/Lib/lua/luarun.swg @@ -1789,7 +1789,7 @@ SWIGRUNTIME int SWIG_Lua_ConvertPtr(lua_State *L,int index,void **ptr,swig_type } else { - cast=SWIG_TypeCheck(usr->type->name,type); /* performs normal type checking */ + cast=SWIG_TypeCheckStruct(usr->type,type); /* performs normal type checking */ if (cast) { int newmemory = 0; |