← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

  • Committer: David Shrewsbury
  • Date: 2011-02-28 14:33:56 UTC
  • mfrom: (2207 bootstrap)
  • mto: (2208.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2209.
  • Revision ID: shrewsbury.dave@gmail.com-20110228143356-ws2m2tp7an44egkd
https://launchpad.net/bugs/720908
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
24
24
#include <drizzled/memory/sql_alloc.h>
25
25
#include <drizzled/sql_list.h>
26
26
#include <drizzled/natural_join_column.h>
 
27
#include <drizzled/item/field.h>
27
28
 
28
 
namespace drizzled
29
 
{
 
29
namespace drizzled {
30
30
 
31
31
class Table;
32
32
class TableList;
78
78
 
79
79
class Field_iterator_natural_join: public Field_iterator
80
80
{
81
 
  List_iterator_fast<Natural_join_column> column_ref_it;
 
81
  List<Natural_join_column>::iterator column_ref_it;
82
82
  Natural_join_column *cur_column_ref;
83
83
public:
84
84
  Field_iterator_natural_join() :cur_column_ref(NULL) {}