← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/int64_t.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 18:16:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624181614-cju6aaqmn2u5w2nw
Converted all usages of cmax in drizzled/field/ and drizzled/function/ to std::max.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/int64_t.cc
25
25
#include <drizzled/table.h>
26
26
#include <drizzled/session.h>
27
27
 
 
28
#include <algorithm>
 
29
 
 
30
using namespace std;
 
31
 
28
32
 
29
33
/****************************************************************************
30
34
 Field type int64_t int (8 bytes)
144
148
{
145
149
  const CHARSET_INFO * const cs= &my_charset_bin;
146
150
  uint32_t length;
147
 
  uint32_t mlength=cmax(field_length+1,22*cs->mbmaxlen);
 
151
  uint32_t mlength= max(field_length+1,22*cs->mbmaxlen);
148
152
  val_buffer->alloc(mlength);
149
153
  char *to=(char*) val_buffer->ptr();
150
154
  int64_t j;