← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_alloc.cc

  • Committer: Monty Taylor
  • Date: 2009-01-23 06:03:42 UTC
  • mto: (801.1.3 testable) (779.3.2 devel)
  • mto: This revision was merged to the branch mainline in revision 811.
  • Revision ID: mordred@inaugust.com-20090123060342-i00afsgar78qz3nu
Got rid of __attribute__((unused)) and the like from the .cc files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_alloc.cc
17
17
 
18
18
#include "mysys_priv.h"
19
19
#include <mystrings/m_string.h>
20
 
#undef EXTRA_DEBUG
21
 
#define EXTRA_DEBUG
22
20
 
23
21
 
24
22
/*
43
41
*/
44
42
 
45
43
void init_alloc_root(MEM_ROOT *mem_root, size_t block_size,
46
 
                     size_t pre_alloc_size __attribute__((unused)))
 
44
                     size_t )
47
45
{
48
46
  mem_root->free= mem_root->used= mem_root->pre_alloc= 0;
49
47
  mem_root->min_malloc= 32;
74
72
*/
75
73
 
76
74
void reset_root_defaults(MEM_ROOT *mem_root, size_t block_size,
77
 
                         size_t pre_alloc_size __attribute__((unused)))
 
75
                         size_t pre_alloc_size)
78
76
{
79
77
  assert(alloc_root_inited(mem_root));
80
78
 
81
79
  mem_root->block_size= block_size - ALLOC_ROOT_MIN_BLOCK_SIZE;
82
 
#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))
83
80
  if (pre_alloc_size)
84
81
  {
85
82
    size_t size= pre_alloc_size + ALIGN_SIZE(sizeof(USED_MEM));
123
120
    }
124
121
  }
125
122
  else
126
 
#endif
 
123
  {
127
124
    mem_root->pre_alloc= 0;
 
125
  }
128
126
}
129
127
 
130
128