← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_alloc.h

  • Committer: Brian Aker
  • Date: 2008-12-02 23:01:32 UTC
  • mfrom: (632.1.25 devel)
  • Revision ID: brian@tangent.org-20081202230132-je5uysmm22avja4b
Merge (plus Solaris warning fixes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_alloc.h
58
58
  { return alloc_root(mem_root, size); }
59
59
  static void *operator new(size_t size, MEM_ROOT *mem_root) throw ()
60
60
  { return alloc_root(mem_root, size); }
61
 
  static void operator delete(void *ptr __attribute__((unused)),
62
 
                              size_t size __attribute__((unused)))
 
61
  static void operator delete(void *, size_t)
63
62
  {  }
64
 
  static void operator delete(void *ptr __attribute__((unused)),
65
 
                              MEM_ROOT *mem_root __attribute__((unused)))
66
 
  { /* never called */ }
67
 
  static void operator delete[](void *ptr __attribute__((unused)),
68
 
                                MEM_ROOT *mem_root __attribute__((unused)))
69
 
  { /* never called */ }
70
 
  static void operator delete[](void *ptr __attribute__((unused)),
71
 
                                size_t size __attribute__((unused)))
 
63
  static void operator delete(void *, MEM_ROOT *)
 
64
  { /* never called */ }
 
65
  static void operator delete[](void *, MEM_ROOT *)
 
66
  { /* never called */ }
 
67
  static void operator delete[](void *, size_t)
72
68
  {  }
73
69
#ifdef HAVE_purify
74
70
  bool dummy;