← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_time.cc

  • Committer: Stewart Smith
  • Date: 2009-07-02 17:18:18 UTC
  • mfrom: (1085 staging)
  • mto: This revision was merged to the branch mainline in revision 1089.
  • Revision ID: stewart@flamingspork.com-20090702171818-qrp4d403iw8tazlg
merge mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_time.cc
22
22
#include <drizzled/util/test.h>
23
23
 
24
24
#include <stdio.h>
 
25
#include <algorithm>
 
26
 
 
27
using namespace std;
 
28
 
25
29
/* Windows version of localtime_r() is declared in my_ptrhead.h */
26
30
 
27
31
uint64_t log_10_int[20]=
250
254
    2003-03-03 20:00:20 AM
251
255
    20:00:20.000000 AM 03-03-2000
252
256
  */
253
 
  i= cmax((uint32_t) format_position[0], (uint32_t) format_position[1]);
 
257
  i= max((uint32_t) format_position[0], (uint32_t) format_position[1]);
254
258
  set_if_bigger(i, (uint32_t) format_position[2]);
255
259
  allow_space= ((1 << i) | (1 << format_position[6]));
256
260
  allow_space&= (1 | 2 | 4 | 8);