← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.h

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.h
157
157
  static void *operator new(size_t size, memory::Root *mem_root);
158
158
  static void operator delete(void *, size_t)
159
159
  { }
 
160
  static void operator delete(void *, memory::Root *)
 
161
  { }
160
162
 
161
163
  Field(unsigned char *ptr_arg,
162
164
        uint32_t length_arg,