← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lex_string.h

  • Committer: Mark Atwood
  • Date: 2011-10-14 15:59:08 UTC
  • mfrom: (2430.1.12 refactor3a)
  • Revision ID: me@mark.atwood.name-20111014155908-whqmrmaf2grpsg5c
merge lp:~olafvdspek/drizzle/refactor3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lex_string.h
42
42
 
43
43
  const char* data() const
44
44
  {
45
 
    return str;
 
45
    return str_;
46
46
  }
47
47
 
48
48
  size_t size() const
49
49
  {
50
 
    return length;
 
50
    return length_;
51
51
  }
52
52
 
53
53
  void assign(const char* d, size_t s)
54
54
  {
55
 
    str= const_cast<char*>(d);
56
 
    length = s;
 
55
    str_= const_cast<char*>(d);
 
56
    length_ = s;
57
57
  }
58
58
 
59
 
  char* str;
60
 
  size_t length;
 
59
  char* str_;
 
60
  size_t length_;
61
61
};
62
62
 
63
63
inline const lex_string_t &null_lex_string()