From 5d5fd5b1224bfba952328e1b2dcd09bea269456b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 6 Jun 2017 19:56:59 +0100 Subject: [PATCH] Fix scilab fragment dependency problem in STL headers import_stl test now working again --- Examples/test-suite/scilab/Makefile.in | 3 --- Lib/scilab/scicontainer.swg | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Examples/test-suite/scilab/Makefile.in b/Examples/test-suite/scilab/Makefile.in index ee0c19f6a..483ed2439 100644 --- a/Examples/test-suite/scilab/Makefile.in +++ b/Examples/test-suite/scilab/Makefile.in @@ -27,9 +27,6 @@ CPP_STD_TEST_CASES += \ li_std_container_typemaps \ li_std_string_extra \ -FAILING_MULTI_CPP_TESTS = \ - import_stl \ - include $(srcdir)/../common.mk # Overriden variables diff --git a/Lib/scilab/scicontainer.swg b/Lib/scilab/scicontainer.swg index 2cc44b8e5..f6078690b 100644 --- a/Lib/scilab/scicontainer.swg +++ b/Lib/scilab/scicontainer.swg @@ -42,7 +42,9 @@ %fragment("SciSequence_Cont", "header", fragment="StdTraits", - fragment="SwigSciIterator_T") + fragment="SwigSciIterator_T", + fragment=SWIG_Traits_Sequence_frag(ptr), + fragment=SWIG_Traits_SequenceItem_frag(ptr)) { namespace swig { @@ -334,8 +336,7 @@ namespace swig %fragment("StdSequenceTraits","header", fragment="StdTraits", - fragment="SciSequence_Cont", - fragment=SWIG_Traits_SequenceItem_frag(ptr)) + fragment="SciSequence_Cont") { namespace swig { template