diff --git a/Examples/test-suite/li_std_map.i b/Examples/test-suite/li_std_map.i index 27c1b1a70..847a6e0b2 100644 --- a/Examples/test-suite/li_std_map.i +++ b/Examples/test-suite/li_std_map.i @@ -16,11 +16,11 @@ */ %module("templatereduce") li_std_map + %feature("trackobjects"); %include std_pair.i %include std_map.i -%include std_multimap.i %inline %{ struct A{ @@ -39,7 +39,6 @@ namespace std %template(pairAA) pair; %template(pairA) pair; %template(mapA) map; - %template(mmapA) multimap; %template(paircA1) pair; %template(paircA2) pair; diff --git a/Examples/test-suite/python/Makefile.in b/Examples/test-suite/python/Makefile.in index f5058df9f..b8bd8944c 100644 --- a/Examples/test-suite/python/Makefile.in +++ b/Examples/test-suite/python/Makefile.in @@ -50,6 +50,7 @@ CPP_TEST_CASES += \ li_std_vectora \ li_std_vector_extra \ li_std_map \ + li_std_multimap \ li_std_pair_extra \ li_std_set \ li_std_stream \ diff --git a/Examples/test-suite/ruby/Makefile.in b/Examples/test-suite/ruby/Makefile.in index 33395c006..d50b478be 100644 --- a/Examples/test-suite/ruby/Makefile.in +++ b/Examples/test-suite/ruby/Makefile.in @@ -15,6 +15,7 @@ CPP_TEST_CASES = \ li_factory \ li_std_functors \ li_std_map \ + li_std_multimap \ li_std_pair_lang_object \ li_std_queue \ li_std_set \ diff --git a/Examples/test-suite/ruby/li_std_map_runme.rb b/Examples/test-suite/ruby/li_std_map_runme.rb index 319fdec52..bd93b9170 100755 --- a/Examples/test-suite/ruby/li_std_map_runme.rb +++ b/Examples/test-suite/ruby/li_std_map_runme.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby # -# Tests for std::map and std::multimap +# Tests for std::map # # # @@ -41,15 +41,6 @@ m["foo"] = "hello" pm = Li_std_map::LanguageMap.new m.each_key { |k| pm[k] = m[k] } m.each_key { |k| swig_assert_equal("pm[#{k.inspect}]", "m[#{k.inspect}]", binding) } - -m = Li_std_map::MmapA.new -m[0] = a1 -m[0] = a2 -m[0].size == 2 -m.respond_to?(:each) == true -m.respond_to?(:each_key) == true -m.respond_to?(:each_value) == true -m.values_at(0)[0] == m[0] EOF mii = Li_std_map::Mapii.new diff --git a/Examples/test-suite/ruby/li_std_multimap_runme.rb b/Examples/test-suite/ruby/li_std_multimap_runme.rb new file mode 100755 index 000000000..b0c2bb359 --- /dev/null +++ b/Examples/test-suite/ruby/li_std_multimap_runme.rb @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +# +# Tests for std::multimap +# +# +# +# +# + +require 'swig_assert' +require 'li_std_multimap' + +swig_assert_each_line(<<'EOF', binding) + +a1 = Li_std_multimap::A.new(3) +a2 = Li_std_multimap::A.new(7) + +m = Li_std_multimap::MultimapA.new +m[0] = a1 +m[0] = a2 +m[0].size == 2 +m.respond_to?(:each) == true +m.respond_to?(:each_key) == true +m.respond_to?(:each_value) == true +m.values_at(0)[0] == m[0] +EOF +