← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/date.h

  • Committer: Monty Taylor
  • Date: 2010-12-27 18:39:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101227183911-atgh0kcubflay0b9
Added back INNOBASE_SKIP_WARNINGS for solaris. Also dealt with unused params.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date.h
20
20
#ifndef DRIZZLED_FUNCTION_TIME_DATE_H
21
21
#define DRIZZLED_FUNCTION_TIME_DATE_H
22
22
 
23
 
#include <drizzled/function/func.h>
24
 
#include <drizzled/function/str/strfunc.h>
 
23
#include "drizzled/function/func.h"
 
24
#include "drizzled/function/str/strfunc.h"
25
25
#include <drizzled/temporal.h>
26
26
 
27
27
namespace drizzled
64
64
    return tmp_table_field_from_field_type(table, 0);
65
65
  }
66
66
  bool result_as_int64_t() { return true; }
67
 
  type::Decimal *val_decimal(type::Decimal *decimal_value)
 
67
  my_decimal *val_decimal(my_decimal *decimal_value)
68
68
  {
69
69
    assert(fixed == 1);
70
70
    return  val_decimal_from_date(decimal_value);
92
92
  }
93
93
  bool result_as_int64_t() { return true; }
94
94
  double val_real() { return (double) val_int(); }
95
 
  type::Decimal *val_decimal(type::Decimal *decimal_value)
 
95
  my_decimal *val_decimal(my_decimal *decimal_value)
96
96
  {
97
97
    assert(fixed == 1);
98
98
    return  val_decimal_from_date(decimal_value);