92128eef44
The erase and insert methods in the containers use const_iterator instead of iterator in C++11. There are times when the methods wrapped must match the parameters exactly. Specifically when full type information for template types is missing or SWIG fails to look up the type correctly, for example: %include <std_vector.i> typedef float Real; %template(RealVector) std::vector<Real>; SWIG does not find std::vector<Real>::iterator because %template using typedefs does not always work and so SWIG doesn't know if the type is copyable and so uses SwigValueWrapper<iterator> which does not support conversion to another type (const_iterator). This resulted in compilation errors when using the C++11 version of the containers. Closes #73
118 lines
2.9 KiB
OpenEdge ABL
118 lines
2.9 KiB
OpenEdge ABL
%include <std_common.i>
|
|
%include <exception.i>
|
|
%include <std_alloc.i>
|
|
|
|
%{
|
|
#include <algorithm>
|
|
%}
|
|
|
|
// Common container methods
|
|
|
|
%define %std_container_methods(container...)
|
|
container();
|
|
container(const container&);
|
|
|
|
bool empty() const;
|
|
size_type size() const;
|
|
void clear();
|
|
|
|
void swap(container& v);
|
|
|
|
allocator_type get_allocator() const;
|
|
|
|
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
|
class iterator;
|
|
class reverse_iterator;
|
|
class const_iterator;
|
|
class const_reverse_iterator;
|
|
|
|
iterator begin();
|
|
iterator end();
|
|
reverse_iterator rbegin();
|
|
reverse_iterator rend();
|
|
#endif
|
|
|
|
%enddef
|
|
|
|
// Common sequence
|
|
|
|
%define %std_sequence_methods_common(sequence)
|
|
|
|
%std_container_methods(%arg(sequence));
|
|
|
|
sequence(size_type size);
|
|
void pop_back();
|
|
|
|
void resize(size_type new_size);
|
|
|
|
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
|
%extend {
|
|
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
|
iterator erase(iterator pos) { return $self->erase(pos); }
|
|
iterator erase(iterator first, iterator last) { return $self->erase(first, last); }
|
|
}
|
|
#endif
|
|
|
|
%enddef
|
|
|
|
|
|
%define %std_sequence_methods(sequence)
|
|
|
|
%std_sequence_methods_common(%arg(sequence));
|
|
|
|
sequence(size_type size, const value_type& value);
|
|
void push_back(const value_type& x);
|
|
|
|
const value_type& front() const;
|
|
const value_type& back() const;
|
|
|
|
void assign(size_type n, const value_type& x);
|
|
|
|
void resize(size_type new_size, const value_type& x);
|
|
|
|
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
|
%extend {
|
|
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
|
iterator insert(iterator pos, const value_type& x) { return $self->insert(pos, x); }
|
|
void insert(iterator pos, size_type n, const value_type& x) { $self->insert(pos, n, x); }
|
|
}
|
|
#endif
|
|
|
|
%enddef
|
|
|
|
%define %std_sequence_methods_val(sequence...)
|
|
|
|
%std_sequence_methods_common(%arg(sequence));
|
|
|
|
sequence(size_type size, value_type value);
|
|
void push_back(value_type x);
|
|
|
|
value_type front() const;
|
|
value_type back() const;
|
|
|
|
void assign(size_type n, value_type x);
|
|
|
|
void resize(size_type new_size, value_type x);
|
|
|
|
#ifdef SWIG_EXPORT_ITERATOR_METHODS
|
|
%extend {
|
|
// %extend wrapper used for differing definitions of these methods introduced in C++11
|
|
iterator insert(iterator pos, value_type x) { return $self->insert(pos, x); }
|
|
void insert(iterator pos, size_type n, value_type x) { $self->insert(pos, n, x); }
|
|
}
|
|
#endif
|
|
|
|
%enddef
|
|
|
|
|
|
//
|
|
// Ignore member methods for Type with no default constructor
|
|
//
|
|
%define %std_nodefconst_type(Type...)
|
|
%feature("ignore") std::vector<Type >::vector(size_type size);
|
|
%feature("ignore") std::vector<Type >::resize(size_type size);
|
|
%feature("ignore") std::deque<Type >::deque(size_type size);
|
|
%feature("ignore") std::deque<Type >::resize(size_type size);
|
|
%feature("ignore") std::list<Type >::list(size_type size);
|
|
%feature("ignore") std::list<Type >::resize(size_type size);
|
|
%enddef
|