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

fix for solaris + no stlport4

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8668 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-01 16:24:23 +00:00
commit 14a5d7f762
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
SWIG/Lib/python/pyiterators.swg
View file

@ -168,8 +168,7 @@ namespace swig {
} }
} }
%fragment("PySwigIterator_T","header",fragment="StdTraits") { %fragment("PySwigIterator_T","header",fragment="StdTraits",fragment="StdIteratorTraits") {
%#include <iterator>
namespace swig { namespace swig {
template<typename OutIterator> template<typename OutIterator>

22
SWIG/Lib/std/std_common.i
View file

@ -11,12 +11,12 @@
// Here, we identify compilers we now have problems with STL. // Here, we identify compilers we now have problems with STL.
%{ %{
#if defined(__SUNPRO_CC) #if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
#define SWIG_STD_NOASSIGN_STL #define SWIG_STD_NOASSIGN_STL
#define SWIG_STD_NOINSERT_TEMPLATE_STL #define SWIG_STD_NOINSERT_TEMPLATE_STL
#define SWIG_STD_NOITERATOR_TRAITS_STL
#endif #endif
#if defined(__GNUC__) #if defined(__GNUC__)
# if __GNUC__ == 2 && __GNUC_MINOR <= 96 # if __GNUC__ == 2 && __GNUC_MINOR <= 96
# define SWIG_STD_NOMODERN_STL # define SWIG_STD_NOMODERN_STL
@ -36,9 +36,23 @@
%} %}
%fragment("StdIteratorTraits","header") %{
#if !defined(SWIG_STD_NOITERATOR_TRAITS_STL)
#include <iterator>
#else
template <class Iterator>
struct iterator_traits {
typedef typename Iterator::value_type value_type;
};
%fragment("StdTraitsCommon","header") template <class T>
%{ struct iterator_traits<T*> {
typedef T value_type;
};
#endif
%}
%fragment("StdTraitsCommon","header") %{
namespace swig { namespace swig {
template <class Type> template <class Type>
struct noconst_traits { struct noconst_traits {