← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.h

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.h
170
170
private:
171
171
  memory::Root mem_root;
172
172
 
173
 
  void *alloc_root(size_t arg)
 
173
  unsigned char* alloc(size_t arg)
174
174
  {
175
 
    return mem_root.alloc_root(arg);
 
175
    return mem_root.alloc(arg);
176
176
  }
177
177
 
178
178
  char *strmake(const char *str_arg, size_t len_arg)
180
180
    return mem_root.strmake(str_arg, len_arg);
181
181
  }
182
182
 
183
 
  memory::Root *getMemRoot()
 
183
  memory::Root& getMemRoot()
184
184
  {
185
 
    return &mem_root;
 
185
    return mem_root;
186
186
  }
187
187
 
188
188
  std::vector<std::string> _keynames;