← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.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/log.cc
1667
1667
  {
1668
1668
    char *p= fn_ext(log_name);
1669
1669
    uint length= (uint) (p - log_name);
1670
 
    strmake(buff, log_name, min(length, FN_REFLEN));
 
1670
    strmake(buff, log_name, min(length, (uint)FN_REFLEN));
1671
1671
    return (const char*)buff;
1672
1672
  }
1673
1673
  return log_name;