← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_alloc.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_alloc.cc
18
18
#include "mysys/mysys_priv.h"
19
19
#include <mystrings/m_string.h>
20
20
 
 
21
#include <algorithm>
 
22
 
 
23
using namespace std;
21
24
 
22
25
/*
23
26
  Initialize memory root
154
157
  {                                             /* Time to alloc new block */
155
158
    block_size= mem_root->block_size * (mem_root->block_num >> 2);
156
159
    get_size= length+ALIGN_SIZE(sizeof(USED_MEM));
157
 
    get_size= cmax(get_size, block_size);
 
160
    get_size= max(get_size, block_size);
158
161
 
159
162
    if (!(next = (USED_MEM*) malloc(get_size)))
160
163
    {