← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/concat.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 18:16:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624181614-cju6aaqmn2u5w2nw
Converted all usages of cmax in drizzled/field/ and drizzled/function/ to std::max.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/concat.cc
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/session.h>
25
25
 
 
26
#include <algorithm>
 
27
 
 
28
using namespace std;
 
29
 
26
30
String *Item_func_concat::val_str(String *str)
27
31
{
28
32
  assert(fixed == 1);
125
129
          }
126
130
          else
127
131
          {
128
 
            uint32_t new_len = cmax(tmp_value.alloced_length() * 2, concat_len);
 
132
            uint32_t new_len= max(tmp_value.alloced_length() * 2, concat_len);
129
133
 
130
134
            if (tmp_value.realloc(new_len))
131
135
              goto null;
295
299
        }
296
300
        else
297
301
        {
298
 
          uint32_t new_len = cmax(tmp_value.alloced_length() * 2, concat_len);
 
302
          uint32_t new_len= max(tmp_value.alloced_length() * 2, concat_len);
299
303
 
300
304
          if (tmp_value.realloc(new_len))
301
305
            goto null;