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.

5 files changed, 8 insertions, 8 deletions

diff --git a/Lib/std/_std_deque.i b/Lib/std/_std_deque.i
index e860e947f..af9db27f4 100644
--- a/Lib/std/_std_deque.i
+++ b/Lib/std/_std_deque.i
@@ -24,7 +24,7 @@
          };
 */
 
-%define %std_deque_methods_noempty(T)
+%define %std_deque_methods_noempty(T...)
        typedef size_t size_type;
        typedef ptrdiff_t difference_type;
        typedef T value_type;
@@ -116,7 +116,7 @@
 %enddef
 
 #ifdef SWIGPHP
-%define %std_deque_methods(T)
+%define %std_deque_methods(T...)
     %extend {
         bool is_empty() const {
             return self->empty();
@@ -125,7 +125,7 @@
     %std_deque_methods_noempty(T)
 %enddef
 #else
-%define %std_deque_methods(T)
+%define %std_deque_methods(T...)
     bool empty() const;
     %std_deque_methods_noempty(T)
 %enddef
diff --git a/Lib/std/std_deque.i b/Lib/std/std_deque.i
index 29560caed..aa5536bf6 100644
--- a/Lib/std/std_deque.i
+++ b/Lib/std/std_deque.i
@@ -120,7 +120,7 @@ namespace std {
     %swig_deque_methods_val(std::deque< _Tp*, _Alloc >);
 #endif
 
-    %std_deque_methods_val(std::deque< _Tp*, _Alloc >);
+    %std_deque_methods_val(deque);
   };
 
 }
diff --git a/Lib/std/std_list.i b/Lib/std/std_list.i
index 1aaec0aa9..ebbafa22b 100644
--- a/Lib/std/std_list.i
+++ b/Lib/std/std_list.i
@@ -6,7 +6,7 @@
 
 // List
 
-%define %std_list_methods(list)
+%define %std_list_methods(list...)
   %std_sequence_methods(list)
   
   void pop_front();
@@ -17,7 +17,7 @@
 %enddef
 
 
-%define %std_list_methods_val(list)
+%define %std_list_methods_val(list...)
   %std_sequence_methods_val(list)
   
   void pop_front();
diff --git a/Lib/std/std_queue.i b/Lib/std/std_queue.i
index 7452a4b60..b2c8d8d33 100644
--- a/Lib/std/std_queue.i
+++ b/Lib/std/std_queue.i
@@ -122,7 +122,7 @@ namespace std {
     %swig_queue_methods_val(std::queue< _Tp*, _Sequence >);
 #endif
 
-    %std_queue_methods_val(std::queue< _Tp*, _Sequence >);
+    %std_queue_methods_val(queue);
   };
 
 }
diff --git a/Lib/std/std_stack.i b/Lib/std/std_stack.i
index 48dae0585..5b624b571 100644
--- a/Lib/std/std_stack.i
+++ b/Lib/std/std_stack.i
@@ -121,7 +121,7 @@ namespace std {
     %swig_stack_methods_val(std::stack< _Tp*, _Sequence >);
 #endif
 
-    %std_stack_methods_val(std::stack< _Tp*, _Sequence >);
+    %std_stack_methods_val(stack);
   };
 
 }