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

Refactor std_container iterator functions

Browse source 
This is for future improvements in the C++11 unordered containers which
do not have reverse iterators.
This commit is contained in:
William S Fulton 2017-01-27 18:45:22 +00:00
commit 65689af848
1 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Lib/std/std_container.i
View file

@ -17,14 +17,24 @@
size_type size() const; size_type size() const;
void swap(container& v); void swap(container& v);
%enddef
%define %std_container_methods_forward_iterators(container...)
#ifdef SWIG_EXPORT_ITERATOR_METHODS #ifdef SWIG_EXPORT_ITERATOR_METHODS
class iterator; class iterator;
class reverse_iterator;
class const_iterator; class const_iterator;
class const_reverse_iterator;
iterator begin(); iterator begin();
iterator end(); iterator end();
#endif
%enddef
%define %std_container_methods_reverse_iterators(container...)
#ifdef SWIG_EXPORT_ITERATOR_METHODS
class reverse_iterator;
class const_reverse_iterator;
reverse_iterator rbegin(); reverse_iterator rbegin();
reverse_iterator rend(); reverse_iterator rend();
#endif #endif
@ -34,7 +44,20 @@
// Common container methods // Common container methods
%define %std_container_methods(container...) %define %std_container_methods(container...)
%std_container_methods_non_resizable(%arg(container)) %std_container_methods_non_resizable(%arg(container))
%std_container_methods_forward_iterators(%arg(container))
%std_container_methods_reverse_iterators(%arg(container))
void clear();
allocator_type get_allocator() const;
%enddef
%define %std_container_methods_without_reverse_iterators(container...)
%std_container_methods_non_resizable(%arg(container))
%std_container_methods_forward_iterators(%arg(container))
void clear(); void clear();
allocator_type get_allocator() const; allocator_type get_allocator() const;
@ -65,6 +88,8 @@
%define %std_sequence_methods_non_resizable(sequence) %define %std_sequence_methods_non_resizable(sequence)
%std_container_methods_non_resizable(%arg(sequence)) %std_container_methods_non_resizable(%arg(sequence))
%std_container_methods_forward_iterators(%arg(container))
%std_container_methods_reverse_iterators(%arg(container))
const value_type& front() const; const value_type& front() const;
const value_type& back() const; const value_type& back() const;
@ -97,6 +122,8 @@
%define %std_sequence_methods_non_resizable_val(sequence...) %define %std_sequence_methods_non_resizable_val(sequence...)
%std_container_methods_non_resizable(%arg(sequence)) %std_container_methods_non_resizable(%arg(sequence))
%std_container_methods_forward_iterators(%arg(container))
%std_container_methods_reverse_iterators(%arg(container))
value_type front() const; value_type front() const;
value_type back() const; value_type back() const;