← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_string.h

  • Committer: Brian Aker
  • Date: 2008-07-06 07:56:50 UTC
  • mfrom: (53.2.38 codestyle)
  • Revision ID: brian@tangent.org-20080706075650-17hslbw06ggz9zb0
Resolved merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_string.h
81
81
  }
82
82
  static void *operator new(size_t size, MEM_ROOT *mem_root)
83
83
  { return (void*) alloc_root(mem_root, (uint) size); }
84
 
  static void operator delete(void *ptr_arg,size_t size)
 
84
  static void operator delete(void *ptr_arg __attribute__((__unused__)),
 
85
                              size_t size __attribute__((__unused__)))
85
86
  { TRASH(ptr_arg, size); }
86
 
  static void operator delete(void *ptr_arg, MEM_ROOT *mem_root)
 
87
  static void operator delete(void *ptr_arg __attribute__((__unused__)),
 
88
                              MEM_ROOT *mem_root __attribute__((__unused__)))
87
89
  { /* never called */ }
88
90
  ~String() { free(); }
89
91