← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_conv.cc

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 17:50:09 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704175009-0mgnno8qm97kvgn0
Remove String::c_ptr_quick()
Add standard C++ members begin, end, data and size to String
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_conv.cc
345
345
  char buff[MAX_FIELD_WIDTH];
346
346
  copy->tmp.set_quick(buff,sizeof(buff),copy->tmp.charset());
347
347
  copy->from_field->val_str_internal(&copy->tmp);
348
 
  copy->to_field->store(copy->tmp.c_ptr_quick(),copy->tmp.length(),
349
 
                        copy->tmp.charset());
 
348
  copy->to_field->store(copy->tmp.data(),copy->tmp.length(), copy->tmp.charset());
350
349
}
351
350
 
352
351
 
857
856
      end with \0. Can be replaced with .ptr() when we have our own
858
857
      string->double conversion.
859
858
    */
860
 
    return to->store(result.c_ptr_quick(),result.length(),from->charset());
 
859
    return to->store(result.c_str(),result.length(),from->charset());
861
860
  }
862
861
  else if (from->result_type() == REAL_RESULT)
863
862
  {