← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/default.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 23:48:15 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624234815-q51znoiozkas596c
Converted all cmin/cmax usages in the mysys directory to std::min/max.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/default.cc
40
40
#include <drizzled/configmake.h>
41
41
 
42
42
#include <stdio.h>
 
43
#include <algorithm>
 
44
 
 
45
using namespace std;
43
46
 
44
47
const char *my_defaults_file=0;
45
48
const char *my_defaults_group_suffix=0;
724
727
      for ( ; my_isspace(&my_charset_utf8_general_ci,end[-1]) ; end--) ;
725
728
      end[0]=0;
726
729
 
727
 
      strncpy(curr_gr, ptr, cmin((size_t) (end-ptr)+1, sizeof(curr_gr)-1));
728
 
      curr_gr[cmin((size_t)(end-ptr)+1, sizeof(curr_gr)-1)] = '\0';
 
730
      strncpy(curr_gr, ptr, min((size_t) (end-ptr)+1, sizeof(curr_gr)-1));
 
731
      curr_gr[min((size_t)(end-ptr)+1, sizeof(curr_gr)-1)] = '\0';
729
732
 
730
733
      /* signal that a new group is found */
731
734
      opt_handler(handler_ctx, curr_gr, NULL);