← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_strfunc.cc

  • Committer: Monty Taylor
  • Date: 2008-08-10 06:11:44 UTC
  • mto: (312.1.3 translations)
  • mto: This revision was merged to the branch mainline in revision 295.
  • Revision ID: monty@inaugust.com-20080810061144-llnyqeju5zckd6pw
Oy. Replaced max and min macros with std::max and std::min so that we get
strong typing. And, then, cast things in the right direction...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_strfunc.cc
2387
2387
  uint sep_length=(arg_count > 3 ? args[3]->max_length : 1);
2388
2388
  max_length=length*64+sep_length*63;
2389
2389
 
2390
 
  if (agg_arg_charsets(collation, args+1, min(4,arg_count)-1,
 
2390
  if (agg_arg_charsets(collation, args+1, min((uint)4,arg_count)-1,
2391
2391
                       MY_COLL_ALLOW_CONV, 1))
2392
2392
    return;
2393
2393
}