← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.h

  • Committer: Elan Ruusamäe
  • Date: 2008-12-04 19:38:26 UTC
  • mfrom: (644 drizzle)
  • mto: (641.3.10 devel)
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: glen@haarber.alkohol.ee-20081204193826-xxyhd45ag121pf3z
- pull from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
100
100
  }
101
101
  static void *operator new(size_t size, MEM_ROOT *mem_root)
102
102
  { return (void*) alloc_root(mem_root, (uint) size); }
103
 
  static void operator delete(void *ptr_arg __attribute__((unused)),
104
 
                              size_t size __attribute__((unused)))
 
103
  static void operator delete(void *, size_t)
105
104
  { TRASH(ptr_arg, size); }
106
 
  static void operator delete(void *ptr_arg __attribute__((unused)),
107
 
                              MEM_ROOT *mem_root __attribute__((unused)))
 
105
  static void operator delete(void *, MEM_ROOT *)
108
106
  { /* never called */ }
109
107
  ~String() { free(); }
110
108