← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
246
246
 
247
247
  static void *operator new(size_t size)
248
248
  {
249
 
    return sql_alloc(size);
 
249
    return drizzled::memory::sql_alloc(size);
250
250
  }
251
 
  static void *operator new(size_t size, MEM_ROOT *mem_root)
 
251
  static void *operator new(size_t size, drizzled::memory::Root *mem_root)
252
252
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
253
253
  static void operator delete(void *, size_t)
254
254
  {  }
255
 
  static void operator delete(void *, MEM_ROOT *)
 
255
  static void operator delete(void *, drizzled::memory::Root *)
256
256
  {}
257
257
  Select_Lex_Node(): linkage(UNSPECIFIED_TYPE) {}
258
258
  virtual ~Select_Lex_Node() {}