← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/file_exchange.h

  • Committer: Monty Taylor
  • Date: 2009-12-29 18:26:43 UTC
  • mfrom: (1257 build)
  • mto: This revision was merged to the branch mainline in revision 1258.
  • Revision ID: mordred@inaugust.com-20091229182643-bv3c4va7rit6wmvl
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/file_exchange.h
22
22
#define DRIZZLED_FILE_EXCHANGE_H
23
23
 
24
24
#include "drizzled/sql_string.h"
25
 
#include "drizzled/sql_alloc.h"
 
25
#include "drizzled/memory/sql_alloc.h"
26
26
#include "drizzled/enum.h"
27
27
 
28
28
extern const CHARSET_INFO *default_charset_info;
37
37
  XXX: We never call destructor for objects of this class.
38
38
*/
39
39
 
40
 
class file_exchange :public Sql_alloc
 
40
class file_exchange :public drizzled::memory::SqlAlloc
41
41
{
42
42
public:
43
43
  enum enum_filetype filetype; /* load XML, Added by Arnold & Erik */