← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/blob.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/blob.cc
32
32
uint32_t
33
33
blob_pack_length_to_max_length(uint32_t arg)
34
34
{
35
 
  return (uint32_t)cmax(UINT32_MAX,
36
 
                        (INT64_C(1) << min(arg, 4U) * 8) - INT64_C(1));
 
35
  return max(UINT32_MAX,
 
36
             (uint32_t)((INT64_C(1) << min(arg, 4U) * 8) - INT64_C(1)));
37
37
}
38
38
 
39
39