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

Fixed issue from swig-user 6/27/11.

Browse source 
Support code in std_map.i needs all the template parameters that std::map takes,
even the default ones (Compare, Allocator).



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12759 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Stefan Zager 2011-07-15 18:49:32 +00:00
commit e167400a29
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.5 (in progress) Version 2.0.5 (in progress)
=========================== ===========================
2011-07-13: szager
[python] Add all template parameters to map support code in std_map.i
2011-07-13: szager 2011-07-13: szager
Fix for bug 3324753: %rename member variables with -builtin. Fix for bug 3324753: %rename member variables with -builtin.

20
Lib/python/std_map.i
View file

@ -5,19 +5,19 @@
%fragment("StdMapTraits","header",fragment="StdSequenceTraits") %fragment("StdMapTraits","header",fragment="StdSequenceTraits")
{ {
namespace swig { namespace swig {
template <class SwigPySeq, class K, class T > template <class SwigPySeq, class K, class T, class Compare, class Alloc >
inline void inline void
assign(const SwigPySeq& swigpyseq, std::map<K,T > *map) { assign(const SwigPySeq& swigpyseq, std::map<K,T,Compare,Alloc > *map) {
typedef typename std::map<K,T>::value_type value_type; typedef typename std::map<K,T,Compare,Alloc >::value_type value_type;
typename SwigPySeq::const_iterator it = swigpyseq.begin(); typename SwigPySeq::const_iterator it = swigpyseq.begin();
for (;it != swigpyseq.end(); ++it) { for (;it != swigpyseq.end(); ++it) {
map->insert(value_type(it->first, it->second)); map->insert(value_type(it->first, it->second));
} }
} }
template <class K, class T> template <class K, class T, class Compare, class Alloc>
struct traits_asptr<std::map<K,T> > { struct traits_asptr<std::map<K,T,Compare,Alloc > > {
typedef std::map<K,T> map_type; typedef std::map<K,T,Compare,Alloc > map_type;
static int asptr(PyObject *obj, map_type **val) { static int asptr(PyObject *obj, map_type **val) {
int res = SWIG_ERROR; int res = SWIG_ERROR;
SWIG_PYTHON_THREAD_BEGIN_BLOCK; SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@ -27,7 +27,7 @@
/* In Python 3.x the ".items()" method returns a dict_items object */ /* In Python 3.x the ".items()" method returns a dict_items object */
items = PySequence_Fast(items, ".items() didn't return a sequence!"); items = PySequence_Fast(items, ".items() didn't return a sequence!");
%#endif %#endif
res = traits_asptr_stdseq<std::map<K,T>, std::pair<K, T> >::asptr(items, val); res = traits_asptr_stdseq<map_type, std::pair<K, T> >::asptr(items, val);
} else { } else {
map_type *p; map_type *p;
res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0); res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<map_type>(),0);
@ -38,9 +38,9 @@
} }
}; };
template <class K, class T > template <class K, class T, class Compare, class Alloc >
struct traits_from<std::map<K,T> > { struct traits_from<std::map<K,T,Compare,Alloc > > {
typedef std::map<K,T> map_type; typedef std::map<K,T,Compare,Alloc > map_type;
typedef typename map_type::const_iterator const_iterator; typedef typename map_type::const_iterator const_iterator;
typedef typename map_type::size_type size_type; typedef typename map_type::size_type size_type;