diff --git a/Lib/csharp/std_array.i b/Lib/csharp/std_array.i index 61bb510de..e7d392b85 100644 --- a/Lib/csharp/std_array.i +++ b/Lib/csharp/std_array.i @@ -174,7 +174,7 @@ bool empty() const; %rename(Fill) fill; - void fill(const value_type& val); + void fill(const value_type& value); %rename(Swap) swap; void swap(array& other); @@ -192,9 +192,9 @@ else throw std::out_of_range("index"); } - void setitem(int index, const_reference val) throw (std::out_of_range) { + void setitem(int index, const_reference value) throw (std::out_of_range) { if (index>=0 && index<(int)$self->size()) - (*$self)[index] = val; + (*$self)[index] = value; else throw std::out_of_range("index"); } diff --git a/Lib/csharp/std_map.i b/Lib/csharp/std_map.i index 90a865079..59b0a84f0 100644 --- a/Lib/csharp/std_map.i +++ b/Lib/csharp/std_map.i @@ -239,11 +239,11 @@ return iter != $self->end(); } - void Add(const key_type& key, const mapped_type& val) throw (std::out_of_range) { + void Add(const key_type& key, const mapped_type& value) throw (std::out_of_range) { std::map< K, T, C >::iterator iter = $self->find(key); if (iter != $self->end()) throw std::out_of_range("key already exists"); - $self->insert(std::pair< K, T >(key, val)); + $self->insert(std::pair< K, T >(key, value)); } bool Remove(const key_type& key) { diff --git a/Lib/csharp/std_vector.i b/Lib/csharp/std_vector.i index b0485eba6..52a865e67 100644 --- a/Lib/csharp/std_vector.i +++ b/Lib/csharp/std_vector.i @@ -231,9 +231,9 @@ else throw std::out_of_range("index"); } - void setitem(int index, CTYPE const& val) throw (std::out_of_range) { + void setitem(int index, CTYPE const& value) throw (std::out_of_range) { if (index>=0 && index<(int)$self->size()) - (*$self)[index] = val; + (*$self)[index] = value; else throw std::out_of_range("index"); } diff --git a/Lib/d/std_vector.i b/Lib/d/std_vector.i index 56f7188c7..c67057180 100644 --- a/Lib/d/std_vector.i +++ b/Lib/d/std_vector.i @@ -165,11 +165,11 @@ public void capacity(size_t value) { // generation issue when using const pointers as vector elements (like // std::vector< const int* >). %extend { - void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) { + void setElement(size_type index, CTYPE const& value) throw (std::out_of_range) { if ((index < 0) || ($self->size() <= index)) { throw std::out_of_range("Tried to set value of element with invalid index."); } - (*$self)[index] = val; + (*$self)[index] = value; } } @@ -517,11 +517,11 @@ int opApply(int delegate(ref size_t index, ref $typemap(dtype, CTYPE) value) dg) // generation issue when using const pointers as vector elements (like // std::vector< const int* >). %extend { - void setElement(size_type index, CTYPE const& val) throw (std::out_of_range) { + void setElement(size_type index, CTYPE const& value) throw (std::out_of_range) { if ((index < 0) || ($self->size() <= index)) { throw std::out_of_range("Tried to set value of element with invalid index."); } - (*$self)[index] = val; + (*$self)[index] = value; } } diff --git a/Lib/java/std_array.i b/Lib/java/std_array.i index cbacfe673..f75857e21 100644 --- a/Lib/java/std_array.i +++ b/Lib/java/std_array.i @@ -29,10 +29,10 @@ namespace std { else throw std::out_of_range("array index out of range"); } - void set(int i, const value_type& val) throw (std::out_of_range) { + void set(int i, const value_type& value) throw (std::out_of_range) { int size = int(self->size()); if (i>=0 && isize()); if (i>=0 && i