Merge branch 'master' into gsoc2009-matevz

parser.y still to be fixed up

Conflicts:
	Doc/Devel/engineering.html
	Examples/Makefile.in
	Lib/allegrocl/allegrocl.swg
	Lib/csharp/csharp.swg
	Lib/csharp/enums.swg
	Lib/csharp/enumsimple.swg
	Lib/csharp/enumtypesafe.swg
	Lib/java/java.swg
	Lib/python/pydocs.swg
	Lib/r/rtype.swg
	Source/Include/swigwarn.h
	Source/Modules/octave.cxx
	Source/Modules/python.cxx
	Source/Modules/ruby.cxx
	Source/Swig/scanner.c
	Source/Swig/stype.c
	Source/Swig/swig.h
	configure.ac
This commit is contained in:
William S Fulton 2013-01-28 07:01:37 +00:00
commit e805d5f925
1074 changed files with 54339 additions and 20134 deletions

View file

@ -25,8 +25,13 @@
*/
%define %std_deque_methods_noempty(T)
typedef T &reference;
typedef const T& const_reference;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef T value_type;
typedef value_type* pointer;
typedef const value_type* const_pointer;
typedef value_type& reference;
typedef const value_type& const_reference;
deque();
deque(unsigned int size, const T& value=T());

View file

@ -20,16 +20,17 @@
%}
//
// Common code for supporting the STD C++ namespace
// Common code for supporting the C++ std namespace
//
%{
#include <string>
#include <stdexcept>
#include <stddef.h>
%}
%fragment("StdIteratorTraits","header") %{
%fragment("StdIteratorTraits","header",fragment="<stddef.h>") %{
#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
# if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
# define SWIG_STD_NOITERATOR_TRAITS_STL

View file

@ -26,10 +26,10 @@
class const_iterator;
class const_reverse_iterator;
const_iterator begin() const;
const_iterator end() const;
const_reverse_iterator rbegin() const;
const_reverse_iterator rend() const;
iterator begin();
iterator end();
reverse_iterator rbegin();
reverse_iterator rend();
#endif
%enddef

View file

@ -49,7 +49,7 @@ namespace std {
};
// ***
// The following specializations should dissapear or get
// The following specializations should disappear or get
// simplified when a 'const SWIGTYPE*&' can be defined
// ***
template <class T, class U > struct pair<T, U*> {

View file

@ -69,6 +69,7 @@ namespace std {
typedef _Alloc allocator_type;
%traits_swigtype(_Tp);
%traits_enum(_Tp);
%fragment(SWIG_Traits_frag(std::vector<_Tp, _Alloc >), "header",
fragment=SWIG_Traits_frag(_Tp),
@ -94,7 +95,7 @@ namespace std {
};
// ***
// This specialization should dissapear or get simplified when
// This specialization should disappear or get simplified when
// a 'const SWIGTYPE*&' can be defined
// ***
template<class _Tp, class _Alloc >