← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lex_string.h

  • Committer: Brian Aker
  • Date: 2011-07-25 14:24:19 UTC
  • mto: This revision was merged to the branch mainline in revision 2373.
  • Revision ID: brian@tangent.org-20110725142419-3vobv9u6k7jp4qej
Remove the typedef on lexkey

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lex_string.h
19
19
 
20
20
#pragma once
21
21
 
22
 
#include <stddef.h>
 
22
#include <cstddef>
23
23
 
24
24
namespace drizzled
25
25
{
26
26
 
27
27
/*
28
 
  LEX_STRING -- a pair of a C-string and its length.
 
28
  lex_string_t -- a pair of a C-string and its length.
29
29
*/
30
30
 
31
31
/* This definition must match the one given in mysql/plugin.h */
32
 
typedef struct lex_string_t
 
32
struct lex_string_t
33
33
{
34
34
  char *str;
35
35
  size_t length;
36
 
} LEX_STRING;
 
36
};
37
37
 
38
 
inline const LEX_STRING &null_lex_string()
 
38
inline const lex_string_t &null_lex_string()
39
39
{
40
 
  static LEX_STRING tmp= { NULL, 0 };
 
40
  static lex_string_t tmp= { NULL, 0 };
41
41
  return tmp;
42
42
}
43
43
 
44
 
#define NULL_LEX_STRING null_lex_string()
 
44
#define NULL_lex_string_t null_lex_string()
45
45
 
46
46
struct execute_string_t : public lex_string_t
47
47
{