diff --git a/CHANGES.current b/CHANGES.current index a4fc5dbf4..be3a32a6f 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release. Version 3.0.0 (in progress) ============================ +2014-01-14: diorcety + Patch #112 - Fix symbol resolution involving scopes that have multiple levels + of typedefs - fixes some template resolutions as well as some typemap searches. + 2014-01-11: wsfulton Fix and document the naturalvar feature override behaviour - the naturalvar feature attached to a variable name has precedence over the naturalvar diff --git a/Examples/test-suite/python/typedef_typedef_runme.py b/Examples/test-suite/python/typedef_typedef_runme.py index ac61dd163..51a823def 100644 --- a/Examples/test-suite/python/typedef_typedef_runme.py +++ b/Examples/test-suite/python/typedef_typedef_runme.py @@ -1,5 +1,5 @@ import typedef_typedef b = typedef_typedef.B() -if b.getValue() == 0: +if b.getValue(123) == 1234: print "Failed !!!" diff --git a/Examples/test-suite/typedef_typedef.i b/Examples/test-suite/typedef_typedef.i index bb309cb20..9bfa14a23 100644 --- a/Examples/test-suite/typedef_typedef.i +++ b/Examples/test-suite/typedef_typedef.i @@ -1,13 +1,11 @@ %module typedef_typedef -/* +// Check C::Bar::Foo resolves to A::Foo in typemap search - We want a specific behaviour on a Type +%typemap(in) SWIGTYPE, int "__wrong_in_typemap__will_not_compile__" -*/ - -%typemap(out) A::Foo { - $result = PyInt_FromLong($1 + 1); +%typemap(in) A::Foo { + $1 = 1234; /* A::Foo in typemap */ } %inline %{ @@ -23,8 +21,8 @@ struct B { - C::Bar::Foo getValue() { - return 0; + C::Bar::Foo getValue(C::Bar::Foo intvalue) { + return intvalue; } }; %}