Fix a few minor inconsistencies in the STL wrappers

Mainly to use a more normal constructor declaration and to enable
classes with more than one template parameter to be used as container types.
This commit is contained in:
William S Fulton 2016-11-29 19:35:09 +00:00
commit 3b03e6addd
5 changed files with 8 additions and 8 deletions

View file

@ -24,7 +24,7 @@
}; };
*/ */
%define %std_deque_methods_noempty(T) %define %std_deque_methods_noempty(T...)
typedef size_t size_type; typedef size_t size_type;
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
typedef T value_type; typedef T value_type;
@ -116,7 +116,7 @@
%enddef %enddef
#ifdef SWIGPHP #ifdef SWIGPHP
%define %std_deque_methods(T) %define %std_deque_methods(T...)
%extend { %extend {
bool is_empty() const { bool is_empty() const {
return self->empty(); return self->empty();
@ -125,7 +125,7 @@
%std_deque_methods_noempty(T) %std_deque_methods_noempty(T)
%enddef %enddef
#else #else
%define %std_deque_methods(T) %define %std_deque_methods(T...)
bool empty() const; bool empty() const;
%std_deque_methods_noempty(T) %std_deque_methods_noempty(T)
%enddef %enddef

View file

@ -120,7 +120,7 @@ namespace std {
%swig_deque_methods_val(std::deque< _Tp*, _Alloc >); %swig_deque_methods_val(std::deque< _Tp*, _Alloc >);
#endif #endif
%std_deque_methods_val(std::deque< _Tp*, _Alloc >); %std_deque_methods_val(deque);
}; };
} }

View file

@ -6,7 +6,7 @@
// List // List
%define %std_list_methods(list) %define %std_list_methods(list...)
%std_sequence_methods(list) %std_sequence_methods(list)
void pop_front(); void pop_front();
@ -17,7 +17,7 @@
%enddef %enddef
%define %std_list_methods_val(list) %define %std_list_methods_val(list...)
%std_sequence_methods_val(list) %std_sequence_methods_val(list)
void pop_front(); void pop_front();

View file

@ -122,7 +122,7 @@ namespace std {
%swig_queue_methods_val(std::queue< _Tp*, _Sequence >); %swig_queue_methods_val(std::queue< _Tp*, _Sequence >);
#endif #endif
%std_queue_methods_val(std::queue< _Tp*, _Sequence >); %std_queue_methods_val(queue);
}; };
} }

View file

@ -121,7 +121,7 @@ namespace std {
%swig_stack_methods_val(std::stack< _Tp*, _Sequence >); %swig_stack_methods_val(std::stack< _Tp*, _Sequence >);
#endif #endif
%std_stack_methods_val(std::stack< _Tp*, _Sequence >); %std_stack_methods_val(stack);
}; };
} }