jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

%shared_ptr and %template testcase modified to work for python -O

Browse source 
Testcase has now been modified to mask the problem by providing the default parameter 'int' in:
%shared_ptr(Space::BaseDefault<short, int>)
If this is not done then d fails to convert to BaseDefault<short>&

This needs fixing in SWIG, but the problem is masked for now, so that the python
testcase works when run with the -O option.
This commit is contained in:
William S Fulton 2016-06-21 19:49:27 +01:00
commit 3459099fb8
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/li_boost_shared_ptr_template.i
View file

@ -67,7 +67,7 @@ INTEGER bar_getter(Base<INTEGER>& foo) {
// 2nd test - templates with default template parameters // 2nd test - templates with default template parameters
#if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED) #if defined(SHARED_PTR_WRAPPERS_IMPLEMENTED)
%shared_ptr(Space::BaseDefault<short>) %shared_ptr(Space::BaseDefault<short, int>)
%shared_ptr(Space::DerivedDefault<short>) %shared_ptr(Space::DerivedDefault<short>)
%shared_ptr(Space::DerivedDefault2<short>) %shared_ptr(Space::DerivedDefault2<short>)

13
Examples/test-suite/python/li_boost_shared_ptr_template_runme.py
View file

@ -22,8 +22,11 @@ if d2.bar2() != 4:
raise RuntimeError raise RuntimeError
if bar2_getter(b) != 3: if bar2_getter(b) != 3:
raise RuntimeError raise RuntimeError
# Fix reverted in rev 12953 # SWIG fix reverted in Subversion rev 12953
# if bar2_getter(d) != 4: # Testcase has now been modified to mask the problem by providing the default parameter 'int' in:
# raise RuntimeError # %shared_ptr(Space::BaseDefault<short, int>)
# if bar2_getter(d2) != 4: # If this is not done then d fails to convert to BaseDefault<short>&
# raise RuntimeError if bar2_getter(d) != 4:
raise RuntimeError
if bar2_getter(d2) != 4:
raise RuntimeError