Fixed renames of std_* containers to a safer

%rename directive.



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9810 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Gonzalo Garramuno 2007-05-16 21:27:08 +00:00
commit d4eec2670b
9 changed files with 90 additions and 4 deletions

View file

@ -7,7 +7,7 @@
%fragment("StdPairTraits","header",fragment="StdTraits") {
namespace swig {
#ifdef SWIG_STD_PAIR_ASVAL
template <class T, class U >
struct traits_asval<std::pair<T,U> > {
typedef std::pair<T,U> value_type;
@ -25,7 +25,7 @@
return res1 > res2 ? res1 : res2;
} else {
T *pfirst = 0;
int res1 = swig::asval((VALUE)first, 0);
int res1 = swig::asval((VALUE)first, pfirst);
if (!SWIG_IsOK(res1)) return res1;
U *psecond = 0;
int res2 = swig::asval((VALUE)second, psecond);
@ -52,7 +52,6 @@
}
};
#else
template <class T, class U >
struct traits_asptr<std::pair<T,U> > {
typedef std::pair<T,U> value_type;
@ -99,8 +98,13 @@
}
};
#endif
template <>
template <class T, class U >
struct noconst_traits< const std::pair< T, U > >
{
typedef std::pair< typename swig::noconst_traits<T >, U > noconst_type;
};
template <class T, class U >
struct traits_from<std::pair<T,U> > {