← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/extract.cc

Merged null-not-zero-as-pointer into remove-bit_fields_as_long.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/extract.cc
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
#include CSTDINT_H
 
21
 
22
22
#include "drizzled/temporal.h"
23
23
#include "drizzled/error.h"
24
24
#include "drizzled/session.h"
25
25
#include "drizzled/calendar.h"
26
26
#include "drizzled/function/time/extract.h"
27
27
 
 
28
namespace drizzled
 
29
{
 
30
 
28
31
/*
29
32
   'interval_names' reflects the order of the enumeration interval_type.
30
33
   See item/time.h
83
86
  }
84
87
 
85
88
  /* We could have either a datetime or a time.. */
86
 
  drizzled::DateTime datetime_temporal;
87
 
  drizzled::Time time_temporal;
 
89
  DateTime datetime_temporal;
 
90
  Time time_temporal;
88
91
 
89
92
  /* Abstract pointer type we'll use in the final switch */
90
 
  drizzled::Temporal *temporal;
 
93
  Temporal *temporal;
91
94
 
92
95
  if (date_value)
93
96
  {
341
344
      return 0;
342
345
  return 1;
343
346
}
 
347
 
 
348
} /* namespace drizzled */