Skip to content

Commit

Permalink
Modify typedef_typedef testcase to work for all languages
Browse files Browse the repository at this point in the history
Add CHANGES note

Closes #112.
  • Loading branch information
wsfulton committed Jan 14, 2014
1 parent 2e18624 commit e531578
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGES.current
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Examples/test-suite/python/typedef_typedef_runme.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import typedef_typedef

b = typedef_typedef.B()
if b.getValue() == 0:
if b.getValue(123) == 1234:
print "Failed !!!"
14 changes: 6 additions & 8 deletions Examples/test-suite/typedef_typedef.i
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
%module typedef_typedef

/*
We want a specific behaviour on a Type
// Check C::Bar::Foo resolves to A::Foo in typemap search

*/
%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 %{
Expand All @@ -23,8 +21,8 @@

struct B
{
C::Bar::Foo getValue() {
return 0;
C::Bar::Foo getValue(C::Bar::Foo intvalue) {
return intvalue;
}
};
%}
Expand Down

0 comments on commit e531578

Please sign in to comment.