diff options
| author | igor@rurik.mysql.com <> | 2003-12-01 18:47:19 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2003-12-01 18:47:19 -0800 |
| commit | e235d796c9b1e5b3b58754fc590b6ed2abf6bc03 (patch) | |
| tree | 31494d26df6b929335d01f1c5d1433017038d9f5 /sql/sql_list.h | |
| parent | 1a9be364dd3a2cd0c4a7ba9cbd25f5f10aac7560 (diff) | |
| parent | e282c8cc6f6ce3a771d12e5d103fc7e509a0aa81 (diff) | |
| download | mariadb-git-e235d796c9b1e5b3b58754fc590b6ed2abf6bc03.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_list.h')
| -rw-r--r-- | sql/sql_list.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_list.h b/sql/sql_list.h index b276c68c16a..bac4a2a8655 100644 --- a/sql/sql_list.h +++ b/sql/sql_list.h @@ -313,9 +313,9 @@ public: List_iterator_fast(List<T> &a) : base_list_iterator(a) {} inline T* operator++(int) { return (T*) base_list_iterator::next_fast(); } inline void rewind(void) { base_list_iterator::rewind(); } - void sublist(List<T> &list, uint el) + void sublist(List<T> &list_arg, uint el_arg) { - base_list_iterator::sublist(list, el); + base_list_iterator::sublist(list_arg, el_arg); } }; |