mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merging
sql/item.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_sum.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_olap.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_union.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged
This commit is contained in:
@ -155,12 +155,20 @@ protected:
|
||||
|
||||
class base_list_iterator
|
||||
{
|
||||
protected:
|
||||
base_list *list;
|
||||
list_node **el,**prev,*current;
|
||||
void sublist(base_list &ls, uint elm)
|
||||
{
|
||||
ls.first= *el;
|
||||
ls.last= list->last;
|
||||
ls.elements= elm;
|
||||
}
|
||||
public:
|
||||
base_list_iterator(base_list &list_par) :list(&list_par),el(&list_par.first),
|
||||
prev(0),current(0)
|
||||
base_list_iterator(base_list &list_par)
|
||||
:list(&list_par), el(&list_par.first), prev(0), current(0)
|
||||
{}
|
||||
|
||||
inline void *next(void)
|
||||
{
|
||||
prev=el;
|
||||
@ -220,7 +228,6 @@ public:
|
||||
friend class error_list_iterator;
|
||||
};
|
||||
|
||||
|
||||
template <class T> class List :public base_list
|
||||
{
|
||||
public:
|
||||
@ -268,6 +275,10 @@ 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)
|
||||
{
|
||||
base_list_iterator::sublist(list, el);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user