← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/hex_string.cc

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/hex_string.cc
23
23
#include <drizzled/item/string.h>
24
24
#include <drizzled/item/hex_string.h>
25
25
 
 
26
#include <algorithm>
 
27
 
 
28
using namespace std;
 
29
 
26
30
inline uint32_t char_val(char X)
27
31
{
28
32
  return (uint32_t) (X >= '0' && X <= '9' ? X-'0' :
55
59
{
56
60
  // following assert is redundant, because fixed=1 assigned in constructor
57
61
  assert(fixed == 1);
58
 
  char *end=(char*) str_value.ptr()+str_value.length(),
59
 
       *ptr=end-cmin(str_value.length(),(uint32_t)sizeof(int64_t));
 
62
  char *end= (char*) str_value.ptr()+str_value.length(),
 
63
       *ptr= end - min(str_value.length(),(uint32_t)sizeof(int64_t));
60
64
 
61
65
  uint64_t value=0;
62
66
  for (; ptr != end ; ptr++)
106
110
void Item_hex_string::print(String *str, enum_query_type)
107
111
{
108
112
  char *end= (char*) str_value.ptr() + str_value.length(),
109
 
       *ptr= end - cmin(str_value.length(), (uint32_t)sizeof(int64_t));
 
113
       *ptr= end - min(str_value.length(), (uint32_t)sizeof(int64_t));
110
114
  str->append("0x");
111
115
  for (; ptr != end ; ptr++)
112
116
  {