← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_getopt.cc

  • Committer: Stewart Smith
  • Date: 2009-07-02 17:18:18 UTC
  • mfrom: (1085 staging)
  • mto: This revision was merged to the branch mainline in revision 1089.
  • Revision ID: stewart@flamingspork.com-20090702171818-qrp4d403iw8tazlg
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_getopt.cc
25
25
#include <stdlib.h>
26
26
#include <errno.h>
27
27
#include <iostream>
 
28
#include <algorithm>
28
29
 
29
30
using namespace std;
30
31
 
971
972
  }
972
973
  if (optp->max_value && num > (double) optp->max_value)
973
974
    num= (double) optp->max_value;
974
 
  return cmax(num, (double) optp->min_value);
 
975
  return max(num, (double) optp->min_value);
975
976
}
976
977
 
977
978
/*