[Swig-cvs] SWIG/Lib/std std_basic_string.i,1.5,1.6 std_deque.i,1.3,1.4 std_ios.i,1.4,1.5 std_iostream.i,1.4,1.5 std_list.i,1.3,1.4 std_map.i,1.3,1.4 std_multimap.i,1.3,1.4 std_multiset.i,1.3,1.4 std_set.i,1.3,1.4 std_sstream.i,1.1,1.2 std_streambuf.i,1.1,1.2 std_string.i,1.2,1.3 std_vector.i,1.3,1.4 std_wstring.i,1.3,1.4

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Lib/std
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29342

Modified Files:
	std_basic_string.i std_deque.i std_ios.i std_iostream.i 
	std_list.i std_map.i std_multimap.i std_multiset.i std_set.i 
	std_sstream.i std_streambuf.i std_string.i std_vector.i 
	std_wstring.i 
Log Message:
using new template resolution for def args, and cosmetics

Index: std_vector.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_vector.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_vector.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_vector.i	16 Dec 2004 01:35:52 -0000	1.4
***************
*** 57,61 ****
  namespace std {
  
!   template<class _Tp, class _Alloc = std::allocator< _Tp > >
    class vector {
    public:
--- 57,61 ----
  namespace std {
  
!   template<class _Tp, class _Alloc = allocator< _Tp > >
    class vector {
    public:

Index: std_list.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_list.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_list.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_list.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 62,66 ****
  namespace std {
  
!   template<class _Tp, class _Alloc = std::allocator<_Tp>  > 
    class list {
    public:
--- 62,66 ----
  namespace std {
  
!   template<class _Tp, class _Alloc = allocator<_Tp>  > 
    class list {
    public:

Index: std_set.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_set.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_set.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_set.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 65,69 ****
  namespace std {
  
!   template <class _Key, class _Compare = less<_Key>,
  	    class _Alloc = allocator<_Key> >
    class set {
--- 65,69 ----
  namespace std {
  
!   template <class _Key, class _Compare = std::less<_Key>,
  	    class _Alloc = allocator<_Key> >
    class set {

Index: std_wstring.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_wstring.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_wstring.i	1 Dec 2004 01:22:30 -0000	1.3
--- std_wstring.i	16 Dec 2004 01:35:52 -0000	1.4
***************
*** 10,16 ****
  namespace std
  {
!   %std_comp_methods(basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >);
!   typedef basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > wstring;
  }
  
! %template(wstring) std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >;
--- 10,16 ----
  namespace std
  {
!   %std_comp_methods(basic_string<wchar_t>);
!   typedef basic_string<wchar_t> wstring;
  }
  
! %template(wstring) std::basic_string<wchar_t>;

Index: std_basic_string.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_basic_string.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** std_basic_string.i	5 Dec 2004 10:15:23 -0000	1.5
--- std_basic_string.i	16 Dec 2004 01:35:51 -0000	1.6
***************
*** 10,14 ****
  namespace std {
  
!   template <class _CharT, class _Traits =  std::char_traits<_CharT>, typename _Alloc = std::allocator<_CharT> > 
    class basic_string
    {
--- 10,14 ----
  namespace std {
  
!   template <class _CharT, class _Traits = char_traits<_CharT>, typename _Alloc = allocator<_CharT> > 
    class basic_string
    {

Index: std_multiset.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_multiset.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_multiset.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_multiset.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 44,48 ****
    //multiset
  
!   template <class _Key, class _Compare = less<_Key>,
  	    class _Alloc = allocator<_Key> >
    class multiset {
--- 44,48 ----
    //multiset
  
!   template <class _Key, class _Compare = std::less<_Key>,
  	    class _Alloc = allocator<_Key> >
    class multiset {

Index: std_ios.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_ios.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** std_ios.i	6 Dec 2004 07:05:48 -0000	1.4
--- std_ios.i	16 Dec 2004 01:35:51 -0000	1.5
***************
*** 248,253 ****
  
  namespace std {
!   %template(ios) basic_ios<char, std::char_traits<char> >;
!   %template(wios) basic_ios<wchar_t, std::char_traits<wchar_t> >;
  }
  
--- 248,253 ----
  
  namespace std {
!   %template(ios) basic_ios<char>;
!   %template(wios) basic_ios<wchar_t>;
  }
  

Index: std_multimap.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_multimap.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_multimap.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_multimap.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 44,48 ****
  namespace std {
    template<class _Key, class _Tp, class _Compare = std::less<_Key >,
! 	   class _Alloc = std::allocator<std::pair<const _Key, _Tp > > >
    class multimap {
    public:
--- 44,48 ----
  namespace std {
    template<class _Key, class _Tp, class _Compare = std::less<_Key >,
! 	   class _Alloc = allocator<std::pair<const _Key, _Tp > > >
    class multimap {
    public:

Index: std_streambuf.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_streambuf.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** std_streambuf.i	10 Oct 2004 06:42:15 -0000	1.1
--- std_streambuf.i	16 Dec 2004 01:35:52 -0000	1.2
***************
*** 6,10 ****
  namespace std {
  
!   template<typename _CharT, typename _Traits>
    class basic_streambuf 
    {
--- 6,10 ----
  namespace std {
  
!   template<typename _CharT, typename _Traits = char_traits<_CharT> >
    class basic_streambuf 
    {
***************
*** 17,22 ****
      typedef typename traits_type::off_type 		off_type;
  
-     typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-       
    public:
      virtual 
--- 17,20 ----
***************
*** 31,35 ****
  
      // Buffer and positioning:
!     __streambuf_type* 
      pubsetbuf(char_type* __s, streamsize __n);
  
--- 29,33 ----
  
      // Buffer and positioning:
!     basic_streambuf<_CharT, _Traits>* 
      pubsetbuf(char_type* __s, streamsize __n);
  
***************
*** 83,87 ****
  
  namespace std {
!   %template(streambuf) basic_streambuf<char, char_traits<char> >;
!   %template(wstreambuf) basic_streambuf<wchar_t, char_traits<wchar_t> >;
  }
--- 81,85 ----
  
  namespace std {
!   %template(streambuf) basic_streambuf<char>;
!   %template(wstreambuf) basic_streambuf<wchar_t>;
  }

Index: std_iostream.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_iostream.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** std_iostream.i	1 Dec 2004 01:22:30 -0000	1.4
--- std_iostream.i	16 Dec 2004 01:35:51 -0000	1.5
***************
*** 78,83 ****
      operator<<(unsigned long long __n);
  
- 
- 
      basic_ostream<_CharT, _Traits>& 
      operator<<(double __f);
--- 78,81 ----
***************
*** 89,93 ****
      operator<<(long double __f);
  
- 
      basic_ostream<_CharT, _Traits>& 
      operator<<(const void* __p);
--- 87,90 ----
***************
*** 280,300 ****
    };
  
!   typedef basic_ostream<char, std::char_traits<char> > ostream ;
!   typedef basic_istream<char, std::char_traits<char> > istream;
!   typedef basic_iostream<char, std::char_traits<char> > iostream;
  
!   typedef basic_ostream<wchar_t, std::char_traits<wchar_t> >  wostream;
!   typedef basic_istream<wchar_t, std::char_traits<wchar_t> >  wistream;
!   typedef basic_iostream<wchar_t, std::char_traits<wchar_t> > wiostream;
  
!   extern std::istream cin;
!   extern std::ostream cout;
!   extern std::ostream cerr;
!   extern std::ostream clog;
  
!   extern std::wistream wcin;
!   extern std::wostream wcout;
!   extern std::wostream wcerr;
!   extern std::wostream wclog;
  
    template<typename _CharT, typename _Traits = char_traits<_CharT> >
--- 277,297 ----
    };
  
!   typedef basic_ostream<char> ostream ;
!   typedef basic_istream<char> istream;
!   typedef basic_iostream<char> iostream;
  
!   typedef basic_ostream<wchar_t>  wostream;
!   typedef basic_istream<wchar_t>  wistream;
!   typedef basic_iostream<wchar_t> wiostream;
  
!   extern istream cin;
!   extern ostream cout;
!   extern ostream cerr;
!   extern ostream clog;
  
!   extern wistream wcin;
!   extern wostream wcout;
!   extern wostream wcerr;
!   extern wostream wclog;
  
    template<typename _CharT, typename _Traits = char_traits<_CharT> >
***************
*** 312,322 ****
  
  namespace std {
!   %template(ostream) basic_ostream<char, std::char_traits<char> >;
!   %template(istream) basic_istream<char, std::char_traits<char> >;
!   %template(iostream) basic_iostream<char, std::char_traits<char> >;
  
!   %template(wostream) basic_ostream<wchar_t, std::char_traits<wchar_t> >;
!   %template(wistream) basic_istream<wchar_t, std::char_traits<wchar_t> >;
!   %template(wiostream) basic_iostream<wchar_t, std::char_traits<wchar_t> >;  
  
    %template(endl) endl<char, std::char_traits<char> >;
--- 309,319 ----
  
  namespace std {
!   %template(ostream) basic_ostream<char>;
!   %template(istream) basic_istream<char>;
!   %template(iostream) basic_iostream<char>;
  
!   %template(wostream) basic_ostream<wchar_t>;
!   %template(wistream) basic_istream<wchar_t>;
!   %template(wiostream) basic_iostream<wchar_t>;  
  
    %template(endl) endl<char, std::char_traits<char> >;

Index: std_map.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_map.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_map.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_map.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 82,86 ****
  
    template<class _Key, class _Tp, class _Compare = std::less<_Key >,
! 	   class _Alloc = std::allocator<std::pair<const _Key, _Tp > > >
    class map {
    public:
--- 82,86 ----
  
    template<class _Key, class _Tp, class _Compare = std::less<_Key >,
! 	   class _Alloc = allocator<std::pair<const _Key, _Tp > > >
    class map {
    public:

Index: std_string.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_string.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** std_string.i	1 Dec 2004 01:22:30 -0000	1.2
--- std_string.i	16 Dec 2004 01:35:52 -0000	1.3
***************
*** 5,12 ****
  namespace std
  {
!   %std_comp_methods(basic_string<char, std::char_traits<char>, std::allocator<char> >);
!   typedef basic_string<char, std::char_traits<char>, std::allocator<char> > string;
  }
  
  
! %template(string) std::basic_string<char, std::char_traits<char>, std::allocator<char> >;
--- 5,12 ----
  namespace std
  {
!   %std_comp_methods(basic_string<char>);
!   typedef basic_string<char> string;
  }
  
  
! %template(string) std::basic_string<char>;

Index: std_sstream.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_sstream.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** std_sstream.i	1 Dec 2004 01:22:30 -0000	1.1
--- std_sstream.i	16 Dec 2004 01:35:51 -0000	1.2
***************
*** 34,46 ****
  
        explicit
!       basic_stringbuf(const basic_string<char_type, _Traits, _Alloc>& __str,
  		      ios_base::openmode __mode = ios_base::in | ios_base::out);
  
        // Get and set:
!       basic_string<char_type, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<char_type, _Traits, _Alloc>& __s);
  
      };
--- 34,46 ----
  
        explicit
!       basic_stringbuf(const basic_string<_CharT, _Traits, _Alloc>& __str,
  		      ios_base::openmode __mode = ios_base::in | ios_base::out);
  
        // Get and set:
!       basic_string<_CharT, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<_CharT, _Traits, _Alloc>& __s);
  
      };
***************
*** 69,73 ****
  
        explicit
!       basic_istringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
  			  ios_base::openmode __mode = ios_base::in);
  
--- 69,73 ----
  
        explicit
!       basic_istringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
  			  ios_base::openmode __mode = ios_base::in);
  
***************
*** 78,86 ****
        rdbuf() const;
  
!       basic_string<char_type, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<char_type, _Traits, _Alloc>& __s);
      };
  
--- 78,86 ----
        rdbuf() const;
  
!       basic_string<_CharT, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<_CharT, _Traits, _Alloc>& __s);
      };
  
***************
*** 108,112 ****
  
        explicit
!       basic_ostringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
  			  ios_base::openmode __mode = ios_base::out);
  
--- 108,112 ----
  
        explicit
!       basic_ostringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
  			  ios_base::openmode __mode = ios_base::out);
  
***************
*** 117,126 ****
        rdbuf() const;
  
!       basic_string<char_type, _Traits, _Alloc>
        str() const;
  
  #if 0
        void
!       str(const basic_string<char_type, _Traits, _Alloc>& __s);
  #endif
      };
--- 117,126 ----
        rdbuf() const;
  
!       basic_string<_CharT, _Traits, _Alloc>
        str() const;
  
  #if 0
        void
!       str(const basic_string<_CharT, _Traits, _Alloc>& __s);
  #endif
      };
***************
*** 148,152 ****
  
        explicit
!       basic_stringstream(const basic_string<char_type, _Traits, _Alloc>& __str,
  			 ios_base::openmode __m = ios_base::out | ios_base::in);
  
--- 148,152 ----
  
        explicit
!       basic_stringstream(const basic_string<_CharT, _Traits, _Alloc>& __str,
  			 ios_base::openmode __m = ios_base::out | ios_base::in);
  
***************
*** 157,165 ****
        rdbuf() const;
  
!       basic_string<char_type, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<char_type, _Traits, _Alloc>& __s);
      };
  
--- 157,165 ----
        rdbuf() const;
  
!       basic_string<_CharT, _Traits, _Alloc>
        str() const;
  
        void
!       str(const basic_string<_CharT, _Traits, _Alloc>& __s);
      };
  
***************
*** 169,179 ****
  
  namespace std {
!   %template(istringstream) basic_istringstream<char, char_traits<char>, allocator<char> >;
!   %template(ostringstream) basic_ostringstream<char, char_traits<char>, allocator<char> >;
!   %template(stringstream)  basic_stringstream<char, char_traits<char>, allocator<char> >;
  
  
!   %template(wistringstream) basic_istringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
!   %template(wostringstream) basic_ostringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
!   %template(wstringstream)  basic_stringstream<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >;
  }
--- 169,179 ----
  
  namespace std {
!   %template(istringstream) basic_istringstream<char>;
!   %template(ostringstream) basic_ostringstream<char>;
!   %template(stringstream)  basic_stringstream<char>;
  
  
!   %template(wistringstream) basic_istringstream<wchar_t>;
!   %template(wostringstream) basic_ostringstream<wchar_t>;
!   %template(wstringstream)  basic_stringstream<wchar_t>;
  }

Index: std_deque.i
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/std/std_deque.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** std_deque.i	5 Dec 2004 10:15:24 -0000	1.3
--- std_deque.i	16 Dec 2004 01:35:51 -0000	1.4
***************
*** 50,54 ****
  namespace std {
  
!   template<class _Tp, class _Alloc = std::allocator<_Tp> > 
    class deque {
    public:
--- 50,54 ----
  namespace std {
  
!   template<class _Tp, class _Alloc = allocator<_Tp> > 
    class deque {
    public: