← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/key_part_spec.h

Style cleanup around TransactionContext::modified_non_trans_table and dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/key_part_spec.h
21
21
#ifndef DRIZZLED_KEY_PART_SPEC_H
22
22
#define DRIZZLED_KEY_PART_SPEC_H
23
23
 
24
 
#include <drizzled/sql_alloc.h>
 
24
#include "drizzled/memory/sql_alloc.h"
 
25
#include "drizzled/lex_string.h"
 
26
 
 
27
namespace drizzled
 
28
{
 
29
 
 
30
namespace memory { class Root; }
25
31
 
26
32
class Item;
27
 
typedef struct st_mem_root MEM_ROOT;
28
33
 
29
 
class Key_part_spec :public Sql_alloc {
 
34
class Key_part_spec :public memory::SqlAlloc {
30
35
public:
31
36
  LEX_STRING field_name;
32
37
  uint32_t length;
35
40
  {}
36
41
  Key_part_spec(const char *name, const size_t name_len, uint32_t len)
37
42
    : length(len)
38
 
  { field_name.str= (char *)name; field_name.length= name_len; }
 
43
  { field_name.str= const_cast<char *>(name); field_name.length= name_len; }
39
44
  bool operator==(const Key_part_spec& other) const;
40
45
  /**
41
46
    Construct a copy of this Key_part_spec. field_name is copied
46
51
    @return If out of memory, 0 is returned and an error is set in
47
52
    Session.
48
53
  */
49
 
  Key_part_spec *clone(MEM_ROOT *mem_root) const
50
 
  { return new (mem_root) Key_part_spec(*this); }
 
54
  Key_part_spec *clone(memory::Root *mem_root) const
 
55
  {
 
56
    return new (mem_root) Key_part_spec(*this);
 
57
  }
51
58
};
52
59
 
 
60
} /* namespace drizzled */
 
61
 
53
62
#endif /* DRIZZLED_KEY_PART_SPEC_H */