← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_string.h

  • Committer: Brian Aker
  • Date: 2008-07-26 18:39:33 UTC
  • mfrom: (212.1.3 codestyle)
  • Revision ID: brian@tangent.org-20080726183933-hueup0fcy2zs1hug
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/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 __attribute__((__unused__)),
85
 
                              size_t size __attribute__((__unused__)))
 
84
  static void operator delete(void *ptr_arg __attribute__((unused)),
 
85
                              size_t size __attribute__((unused)))
86
86
  { TRASH(ptr_arg, size); }
87
 
  static void operator delete(void *ptr_arg __attribute__((__unused__)),
88
 
                              MEM_ROOT *mem_root __attribute__((__unused__)))
 
87
  static void operator delete(void *ptr_arg __attribute__((unused)),
 
88
                              MEM_ROOT *mem_root __attribute__((unused)))
89
89
  { /* never called */ }
90
90
  ~String() { free(); }
91
91