← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/sql_string.h

  • Committer: Stewart Smith
  • Date: 2008-07-07 02:19:59 UTC
  • mfrom: (80 drizzle)
  • mto: This revision was merged to the branch mainline in revision 111.
  • Revision ID: stewart@flamingspork.com-20080707021959-1e3eykadgdj0i2v2
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/sql_string.h
70
70
  }
71
71
  static void *operator new(size_t size, MEM_ROOT *mem_root)
72
72
  { return (void*) alloc_root(mem_root, (uint) size); }
73
 
  static void operator delete(void *ptr_arg,size_t size)
74
 
  { TRASH(ptr_arg, size); }
75
 
  static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
 
73
  static void operator delete(void *ptr_arg __attribute__((__unused__)),
 
74
                              size_t size __attribute__((__unused__)))
 
75
  { /* never called */ }
 
76
  static void operator delete(void *ptr_arg __attribute__((__unused__)),
 
77
                              MEM_ROOT *mem_root __attribute__((__unused__)))
76
78
  { /* never called */ }
77
79
  ~String() { free(); }
78
80