← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.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/set_var.cc
1414
1414
                                            &not_used));
1415
1415
    if (error_len)
1416
1416
    {
1417
 
      strmake(buff, error, min(sizeof(buff) - 1, error_len));
 
1417
      strmake(buff, error, min(sizeof(buff) - 1, (ulong)error_len));
1418
1418
      goto err;
1419
1419
    }
1420
1420
  }