← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
21
21
#ifndef DRIZZLED_FIELD_ITERATOR_H
22
22
#define DRIZZLED_FIELD_ITERATOR_H
23
23
 
24
 
#include <drizzled/sql_alloc.h>
 
24
#include "drizzled/memory/sql_alloc.h"
25
25
#include <drizzled/sql_list.h>
26
26
#include <drizzled/natural_join_column.h>
27
27
 
32
32
  Iterator over the fields of a generic table reference.
33
33
*/
34
34
 
35
 
class Field_iterator: public Sql_alloc
 
35
class Field_iterator: public drizzled::memory::SqlAlloc
36
36
{
37
37
public:
38
38
  Field_iterator() {}                         /* Remove gcc warning */