← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_plugin.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 17:47:02 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624174702-rs66w3tjdnb4jitj
The rest of the files in the drizzled directory were purged of the cmin macro and replace with std::min (except for the definition in globals.h and 1 usage in stacktrace.cc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_plugin.cc
35
35
#include <string>
36
36
#include <vector>
37
37
#include <map>
 
38
#include <algorithm>
38
39
 
39
40
#include <drizzled/error.h>
40
41
#include <drizzled/gettext.h>
1039
1040
                     &error, &error_len, &not_used);
1040
1041
    if (error_len)
1041
1042
    {
1042
 
      length= cmin(sizeof(buff), (unsigned long)error_len);
 
1043
      length= min(sizeof(buff), (unsigned long)error_len);
1043
1044
      strncpy(buff, error, length);
1044
1045
      buff[length]= '\0';
1045
1046
      strvalue= buff;