diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2016-08-01 06:55:01 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2016-08-01 06:55:01 +0100 |
| commit | 4ab3af90cb203572203291ddf99e50ef7cba77bd (patch) | |
| tree | 687b20f349c77e54a5a3c068e0f1291f7f5b360b /Lib/python/std_multimap.i | |
| parent | 5648418c98e5cefc363db1d4ae3125618297ee79 (diff) | |
| parent | 56ab717ff35579e8468d7617162c1b7f46fd2b68 (diff) | |
| download | swig-4ab3af90cb203572203291ddf99e50ef7cba77bd.tar.gz | |
Merge branch 'stl-vector-ptrs'
* stl-vector-ptrs:
Test case warning fixes for nodejs
Fix testcase causing nodejs test failure
UTL STL container descriptor checks
Fix std::vector of pointers which failed if a pointer to a pointer of the container element type existed (Python)
Remove unused traits.swg
Diffstat (limited to 'Lib/python/std_multimap.i')
| -rw-r--r-- | Lib/python/std_multimap.i | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/python/std_multimap.i b/Lib/python/std_multimap.i index 2c539cf29..3209fb0f8 100644 --- a/Lib/python/std_multimap.i +++ b/Lib/python/std_multimap.i @@ -26,7 +26,8 @@ return traits_asptr_stdseq<std::multimap<K,T>, std::pair<K, T> >::asptr(items, val); } else { multimap_type *p; - res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<multimap_type>(),0); + swig_type_info *descriptor = swig::type_info<multimap_type>(); + res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res) && val) *val = p; } return res; |