← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/rpl_rli.cc

  • Committer: Monty Taylor
  • Date: 2008-08-10 06:11:44 UTC
  • mto: (312.1.3 translations)
  • mto: This revision was merged to the branch mainline in revision 295.
  • Revision ID: monty@inaugust.com-20080810061144-llnyqeju5zckd6pw
Oy. Replaced max and min macros with std::max and std::min so that we get
strong typing. And, then, cast things in the right direction...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/rpl_rli.cc
604
604
  uint32_t log_name_extension;
605
605
  char log_name_tmp[FN_REFLEN]; //make a char[] from String
606
606
 
607
 
  strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), FN_REFLEN-1));
 
607
  strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), (uint32_t)FN_REFLEN-1));
608
608
 
609
609
  char *p= fn_ext(log_name_tmp);
610
610
  char *p_end;
614
614
    goto err;
615
615
  }
616
616
  // Convert 0-3 to 4
617
 
  log_pos= max(log_pos, BIN_LOG_HEADER_SIZE);
 
617
  log_pos= max(log_pos, (int64_t)BIN_LOG_HEADER_SIZE);
618
618
  /* p points to '.' */
619
619
  log_name_extension= strtoul(++p, &p_end, 10);
620
620
  /*