← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/float.cc

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/float.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 */
19
19
 
20
20
#include "config.h"
21
 
 
22
21
#include <math.h>
23
 
 
24
22
#include <drizzled/error.h>
25
 
#include <drizzled/field.h>
26
 
#include <drizzled/item/float.h>
27
23
#include <drizzled/item/num.h>
28
24
#include <drizzled/item/string.h>
 
25
#include <drizzled/item/float.h>
29
26
 
30
27
namespace drizzled
31
28
{
77
74
  return (int64_t) rint(value);
78
75
}
79
76
 
80
 
type::Decimal *Item_float::val_decimal(type::Decimal *decimal_value)
 
77
my_decimal *Item_float::val_decimal(my_decimal *decimal_value)
81
78
{
82
79
  // following assert is redundant, because fixed=1 assigned in constructor
83
80
  assert(fixed == 1);
84
 
  double2_class_decimal(E_DEC_FATAL_ERROR, value, decimal_value);
 
81
  double2my_decimal(E_DEC_FATAL_ERROR, value, decimal_value);
85
82
  return (decimal_value);
86
83
}
87
84