diff --git a/Lib/allegrocl/std_list.i b/Lib/allegrocl/std_list.i index 26472156f..a3660c9f7 100644 --- a/Lib/allegrocl/std_list.i +++ b/Lib/allegrocl/std_list.i @@ -40,9 +40,8 @@ namespace std{ list(); list(unsigned int size, const T& value = T()); - list(const list &other); + list(const list& other); - ~list(); void assign(unsigned int n, const T& value); void swap(list &x); diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i index 9884e29a5..e538a03a1 100644 --- a/Lib/csharp/std_map.i +++ b/Lib/csharp/std_map.i @@ -221,7 +221,7 @@ typedef const value_type& const_reference; map(); - map(const map< K, T, C > &other); + map(const map& other); size_type size() const; bool empty() const; %rename(Clear) clear; diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i index fa60a061d..b1e8da963 100644 --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -217,8 +217,10 @@ void reserve(size_type n); %newobject GetRange(int index, int count); %newobject Repeat(CTYPE const& value, int count); + vector(); vector(const vector &other); + %extend { vector(int capacity) throw (std::out_of_range) { std::vector< CTYPE >* pv = 0; diff --git a/Lib/d/std_map.i b/Lib/d/std_map.i index b869ac599..c5e03d06d 100644 --- a/Lib/d/std_map.i +++ b/Lib/d/std_map.i @@ -30,7 +30,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/d/std_vector.i b/Lib/d/std_vector.i index cba3cd4a6..9dcb184c6 100644 --- a/Lib/d/std_vector.i +++ b/Lib/d/std_vector.i @@ -116,8 +116,10 @@ public void capacity(size_t value) { size_type size() const; size_type capacity() const; void reserve(size_type n) throw (std::length_error); + vector(); vector(const vector &other); + %extend { vector(size_type capacity) throw (std::length_error) { std::vector< CTYPE >* pv = 0; @@ -461,8 +463,10 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg) size_type size() const; size_type capacity() const; void reserve(size_type n) throw (std::length_error); + vector(); vector(const vector &other); + %extend { vector(size_type capacity) throw (std::length_error) { std::vector< CTYPE >* pv = 0; diff --git a/Lib/go/std_list.i b/Lib/go/std_list.i index b6e9b6a5a..ff6f70013 100644 --- a/Lib/go/std_list.i +++ b/Lib/go/std_list.i @@ -21,6 +21,8 @@ namespace std { typedef const value_type& const_reference; list(); + list(const list& other); + size_type size() const; bool empty() const; %rename(isEmpty) empty; diff --git a/Lib/go/std_map.i b/Lib/go/std_map.i index 5e21591e9..773b6d0c3 100644 --- a/Lib/go/std_map.i +++ b/Lib/go/std_map.i @@ -34,7 +34,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/go/std_vector.i b/Lib/go/std_vector.i index 708e5ee38..679c70759 100644 --- a/Lib/go/std_vector.i +++ b/Lib/go/std_vector.i @@ -21,6 +21,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); @@ -60,6 +62,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); diff --git a/Lib/guile/std_map.i b/Lib/guile/std_map.i index 4ac22c23d..f84e78bc3 100644 --- a/Lib/guile/std_map.i +++ b/Lib/guile/std_map.i @@ -225,7 +225,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -451,7 +451,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -667,7 +667,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -885,7 +885,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/guile/std_vector.i b/Lib/guile/std_vector.i index 4f7538317..42bad849d 100644 --- a/Lib/guile/std_vector.i +++ b/Lib/guile/std_vector.i @@ -197,7 +197,8 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); + %rename(length) size; unsigned int size() const; %rename("empty?") empty; @@ -369,7 +370,8 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); + %rename(length) size; unsigned int size() const; %rename("empty?") empty; diff --git a/Lib/java/std_list.i b/Lib/java/std_list.i index 516a36ee3..3ad6511ce 100644 --- a/Lib/java/std_list.i +++ b/Lib/java/std_list.i @@ -177,7 +177,8 @@ namespace std { }; list(); - list(const list &other); + list(const list& other); + %rename(isEmpty) empty; bool empty() const; void clear(); diff --git a/Lib/java/std_map.i b/Lib/java/std_map.i index 7ba0b2fe5..357401a4d 100644 --- a/Lib/java/std_map.i +++ b/Lib/java/std_map.i @@ -153,7 +153,7 @@ template typedef const value_type& const_reference; map(); - map(const map& other); + map(const map& other); struct iterator { %typemap(javaclassmodifiers) iterator "protected class" diff --git a/Lib/java/std_set.i b/Lib/java/std_set.i index ddc0379cd..06c5a63e7 100644 --- a/Lib/java/std_set.i +++ b/Lib/java/std_set.i @@ -160,7 +160,7 @@ class set { typedef const value_type& const_reference; set(); - set(const set& other); + set(const set& other); %rename(isEmpty) empty; bool empty() const; diff --git a/Lib/java/std_unordered_map.i b/Lib/java/std_unordered_map.i index eecdf0bc4..57ebe4e39 100644 --- a/Lib/java/std_unordered_map.i +++ b/Lib/java/std_unordered_map.i @@ -153,7 +153,7 @@ template class unordered_map { typedef const value_type& const_reference; unordered_map(); - unordered_map(const unordered_map& other); + unordered_map(const unordered_map& other); struct iterator { %typemap(javaclassmodifiers) iterator "protected class" diff --git a/Lib/java/std_unordered_set.i b/Lib/java/std_unordered_set.i index 98bf3ebf1..cdc116e49 100644 --- a/Lib/java/std_unordered_set.i +++ b/Lib/java/std_unordered_set.i @@ -160,7 +160,7 @@ class unordered_set { typedef const value_type& const_reference; unordered_set(); - unordered_set(const unordered_set& other); + unordered_set(const unordered_set& other); %rename(isEmpty) empty; bool empty() const; diff --git a/Lib/java/std_vector.i b/Lib/java/std_vector.i index 6a66ec10a..f621e8992 100644 --- a/Lib/java/std_vector.i +++ b/Lib/java/std_vector.i @@ -86,6 +86,7 @@ SWIGINTERN jint SWIG_VectorSize(size_t size) { vector(); vector(const vector &other); + size_type capacity() const; void reserve(size_type n) throw (std::length_error); %rename(isEmpty) empty; diff --git a/Lib/javascript/jsc/std_map.i b/Lib/javascript/jsc/std_map.i index 17b56bd48..9fa10880f 100644 --- a/Lib/javascript/jsc/std_map.i +++ b/Lib/javascript/jsc/std_map.i @@ -35,7 +35,7 @@ namespace std { map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/javascript/jsc/std_vector.i b/Lib/javascript/jsc/std_vector.i index 34e21a821..586ac5c60 100644 --- a/Lib/javascript/jsc/std_vector.i +++ b/Lib/javascript/jsc/std_vector.i @@ -23,6 +23,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); @@ -60,9 +62,10 @@ namespace std { typedef value_type& reference; typedef bool const_reference; - vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); diff --git a/Lib/javascript/v8/std_map.i b/Lib/javascript/v8/std_map.i index 41ee1760e..3b8b09369 100644 --- a/Lib/javascript/v8/std_map.i +++ b/Lib/javascript/v8/std_map.i @@ -34,7 +34,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/javascript/v8/std_vector.i b/Lib/javascript/v8/std_vector.i index eef0f65ee..586ac5c60 100644 --- a/Lib/javascript/v8/std_vector.i +++ b/Lib/javascript/v8/std_vector.i @@ -23,6 +23,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); @@ -62,6 +64,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); diff --git a/Lib/lua/std_map.i b/Lib/lua/std_map.i index 5e21591e9..773b6d0c3 100644 --- a/Lib/lua/std_map.i +++ b/Lib/lua/std_map.i @@ -34,7 +34,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/lua/std_vector.i b/Lib/lua/std_vector.i index 695862d66..9eb85e9e6 100644 --- a/Lib/lua/std_vector.i +++ b/Lib/lua/std_vector.i @@ -37,6 +37,7 @@ namespace std { vector(unsigned int); vector(const vector& other); vector(unsigned int,T); + unsigned int size() const; unsigned int max_size() const; bool empty() const; diff --git a/Lib/mzscheme/std_map.i b/Lib/mzscheme/std_map.i index 80a16ced0..1d3eec241 100644 --- a/Lib/mzscheme/std_map.i +++ b/Lib/mzscheme/std_map.i @@ -228,7 +228,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -458,7 +458,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -680,7 +680,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; @@ -902,7 +902,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/mzscheme/std_vector.i b/Lib/mzscheme/std_vector.i index 012c32d32..0ef5edb15 100644 --- a/Lib/mzscheme/std_vector.i +++ b/Lib/mzscheme/std_vector.i @@ -199,7 +199,8 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); + %rename(length) size; unsigned int size() const; %rename("empty?") empty; @@ -383,7 +384,8 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); + %rename(length) size; unsigned int size() const; %rename("empty?") empty; diff --git a/Lib/ocaml/std_list.i b/Lib/ocaml/std_list.i index e173d8b1e..e0524aa40 100644 --- a/Lib/ocaml/std_list.i +++ b/Lib/ocaml/std_list.i @@ -29,9 +29,8 @@ namespace std { list(); list(unsigned int size, const T& value = T()); - list(const list& other); + list(const list& other); - ~list(); void assign(unsigned int n, const T& value); void swap(list &x); diff --git a/Lib/ocaml/std_map.i b/Lib/ocaml/std_map.i index 9ce881699..3f197baa6 100644 --- a/Lib/ocaml/std_map.i +++ b/Lib/ocaml/std_map.i @@ -33,7 +33,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/ocaml/std_vector.i b/Lib/ocaml/std_vector.i index f15b26c66..891d038c9 100644 --- a/Lib/ocaml/std_vector.i +++ b/Lib/ocaml/std_vector.i @@ -51,7 +51,8 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); + unsigned int size() const; bool empty() const; void clear(); diff --git a/Lib/perl5/std_list.i b/Lib/perl5/std_list.i index d42e3d8ef..36678add2 100644 --- a/Lib/perl5/std_list.i +++ b/Lib/perl5/std_list.i @@ -197,7 +197,7 @@ namespace std { typedef const value_type& const_reference; list(); - list(const list& other); + list(const list& other); unsigned int size() const; bool empty() const; @@ -350,7 +350,7 @@ namespace std { typedef const value_type& const_reference; list(); - list(const list& other); + list(const list& other); unsigned int size() const; bool empty() const; diff --git a/Lib/perl5/std_map.i b/Lib/perl5/std_map.i index 91a2acd06..1b3731832 100644 --- a/Lib/perl5/std_map.i +++ b/Lib/perl5/std_map.i @@ -34,7 +34,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/perl5/std_vector.i b/Lib/perl5/std_vector.i index a0c26192e..5bfd2c5ac 100644 --- a/Lib/perl5/std_vector.i +++ b/Lib/perl5/std_vector.i @@ -190,7 +190,7 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector& other); + vector(const vector& other); unsigned int size() const; bool empty() const; @@ -367,7 +367,7 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, T *value); - vector(const vector& other); + vector(const vector& other); unsigned int size() const; bool empty() const; @@ -543,7 +543,7 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, T value); - vector(const vector& other); + vector(const vector& other); unsigned int size() const; bool empty() const; diff --git a/Lib/php/std_map.i b/Lib/php/std_map.i index 64c4ff18d..7c0157353 100644 --- a/Lib/php/std_map.i +++ b/Lib/php/std_map.i @@ -34,7 +34,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; void clear(); diff --git a/Lib/php/std_vector.i b/Lib/php/std_vector.i index fe2b8d07d..e633bc3ad 100644 --- a/Lib/php/std_vector.i +++ b/Lib/php/std_vector.i @@ -23,6 +23,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); @@ -70,6 +72,8 @@ namespace std { vector(); vector(size_type n); + vector(const vector& other); + size_type size() const; size_type capacity() const; void reserve(size_type n); diff --git a/Lib/scilab/std_map.i b/Lib/scilab/std_map.i index de00534b0..07eb63fda 100644 --- a/Lib/scilab/std_map.i +++ b/Lib/scilab/std_map.i @@ -33,7 +33,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/std/std_carray.swg b/Lib/std/std_carray.swg index ebb20ce6a..de2a07627 100644 --- a/Lib/std/std_carray.swg +++ b/Lib/std/std_carray.swg @@ -28,8 +28,8 @@ namespace std { carray() { } - carray(const carray& c) { - std::copy(c.v, c.v + size(), v); + carray(const carray& other) { + std::copy(other.v, other.v + size(), v); } template diff --git a/Lib/tcl/std_map.i b/Lib/tcl/std_map.i index ce1381f03..2c7f40ac7 100644 --- a/Lib/tcl/std_map.i +++ b/Lib/tcl/std_map.i @@ -33,7 +33,7 @@ namespace std { typedef const value_type& const_reference; map(); - map(const map< K, T, C >& other); + map(const map& other); unsigned int size() const; bool empty() const; diff --git a/Lib/tcl/std_vector.i b/Lib/tcl/std_vector.i index bb227cf3d..5fba5379f 100644 --- a/Lib/tcl/std_vector.i +++ b/Lib/tcl/std_vector.i @@ -218,7 +218,7 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector< T >& other); + vector(const vector& other); unsigned int size() const; bool empty() const; @@ -377,7 +377,7 @@ namespace std { vector(unsigned int size = 0); vector(unsigned int size, const T& value); - vector(const vector< T >& other); + vector(const vector& other); unsigned int size() const; bool empty() const;