← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Brian Aker
  • Date: 2008-12-04 06:48:00 UTC
  • Revision ID: brian@tangent.org-20081204064800-pyrclwj0583fms2s
Clean up warnings for Solaris.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
309
309
  }
310
310
  static void *operator new(size_t size, MEM_ROOT *mem_root)
311
311
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
312
 
  static void operator delete(void *ptr __attribute__((unused)),
313
 
                              size_t size __attribute__((unused)))
 
312
  static void operator delete(void *, size_t)
314
313
  { TRASH(ptr, size); }
315
 
  static void operator delete(void *ptr __attribute__((unused)),
316
 
                              MEM_ROOT *mem_root __attribute__((unused)))
 
314
  static void operator delete(void *, MEM_ROOT *)
317
315
  {}
318
316
  st_select_lex_node(): linkage(UNSPECIFIED_TYPE) {}
319
317
  virtual ~st_select_lex_node() {}
342
340
                                        thr_lock_type flags= TL_UNLOCK,
343
341
                                        List<Index_hint> *hints= 0,
344
342
                                        LEX_STRING *option= 0);
345
 
  virtual void set_lock_for_tables(thr_lock_type lock_type __attribute__((unused)))
 
343
  virtual void set_lock_for_tables(thr_lock_type)
346
344
  {}
347
345
 
348
346
  friend class st_select_lex_unit;
1500
1498
  {
1501
1499
    return (void*) alloc_root(mem_root, (uint32_t) size);
1502
1500
  }
1503
 
  static void operator delete(void *ptr __attribute__((unused)),
1504
 
                              size_t size __attribute__((unused)))
 
1501
  static void operator delete(void *, size_t)
1505
1502
  { TRASH(ptr, size); }
1506
 
  static void operator delete(void *ptr __attribute__((unused)),
1507
 
                              MEM_ROOT *mem_root __attribute__((unused)))
 
1503
  static void operator delete(void *, MEM_ROOT *)
1508
1504
  { /* Never called */ }
1509
1505
};
1510
1506