← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.h

  • Committer: Brian Aker
  • Date: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.h
784
784
 
785
785
  static void *operator new(size_t size)
786
786
  {
787
 
    return (void*) my_malloc((uint)size, MYF(MY_WME|MY_FAE));
 
787
    return (void*) malloc(size);
788
788
  }
789
789
 
790
 
  static void operator delete(void *ptr,
791
 
                              size_t)
 
790
  static void operator delete(void *ptr, size_t)
792
791
  {
793
792
    free((unsigned char*) ptr);
794
793
  }