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

Fix scilab fragment dependency problem in STL headers

Browse source 
import_stl test now working again
This commit is contained in:
William S Fulton 2017-06-06 19:56:59 +01:00
commit 5d5fd5b122
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/scilab/Makefile.in
View file

@ -27,9 +27,6 @@ CPP_STD_TEST_CASES += \
li_std_container_typemaps \ li_std_container_typemaps \
li_std_string_extra \ li_std_string_extra \
FAILING_MULTI_CPP_TESTS = \
import_stl \
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
# Overriden variables # Overriden variables

7
Lib/scilab/scicontainer.swg
View file

@ -42,7 +42,9 @@
%fragment("SciSequence_Cont", "header", %fragment("SciSequence_Cont", "header",
fragment="StdTraits", fragment="StdTraits",
fragment="SwigSciIterator_T") fragment="SwigSciIterator_T",
fragment=SWIG_Traits_Sequence_frag(ptr),
fragment=SWIG_Traits_SequenceItem_frag(ptr))
{ {
namespace swig namespace swig
{ {
@ -334,8 +336,7 @@ namespace swig
%fragment("StdSequenceTraits","header", %fragment("StdSequenceTraits","header",
fragment="StdTraits", fragment="StdTraits",
fragment="SciSequence_Cont", fragment="SciSequence_Cont")
fragment=SWIG_Traits_SequenceItem_frag(ptr))
{ {
namespace swig { namespace swig {
template <class SciSeq, class Seq> template <class SciSeq, class Seq>