← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/int.cc

Merge Stewart's dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/int.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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
22
 
#include <drizzled/charset_info.h>
23
 
#include <drizzled/field.h>
24
 
#include <drizzled/internal/m_string.h>
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
25
22
#include <drizzled/item/int.h>
26
23
 
27
 
namespace drizzled
28
 
{
29
 
 
30
24
/**
31
25
  Create an item from a string we KNOW points to a valid int64_t
32
26
  end \\0 terminated number string.
37
31
{
38
32
  char *end_ptr= (char*) str_arg + length;
39
33
  int error;
40
 
  value= internal::my_strtoll10(str_arg, &end_ptr, &error);
 
34
  value= my_strtoll10(str_arg, &end_ptr, &error);
41
35
  max_length= (uint32_t) (end_ptr - str_arg);
42
36
  name= (char*) str_arg;
43
37
  fixed= 1;
44
38
}
45
39
 
46
 
type::Decimal *Item_int::val_decimal(type::Decimal *decimal_value)
 
40
my_decimal *Item_int::val_decimal(my_decimal *decimal_value)
47
41
{
48
 
  int2_class_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
 
42
  int2my_decimal(E_DEC_FATAL_ERROR, value, unsigned_flag, decimal_value);
49
43
  return decimal_value;
50
44
}
51
45
 
89
83
}
90
84
 
91
85
 
92
 
} /* namespace drizzled */
 
86