~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lex_string.h

Merged up with build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
} LEX_STRING;
35
35
 
36
36
 
37
 
#define STRING_WITH_LEN(X) (X), ((size_t) (sizeof(X) - 1))
38
 
#define C_STRING_WITH_LEN(X) ((char *) (X)), ((size_t) (sizeof(X) - 1))
 
37
#define STRING_WITH_LEN(X) (X), (static_cast<size_t>((sizeof(X) - 1)))
 
38
#define C_STRING_WITH_LEN(X) (const_cast<char *>((X))), (static_cast<size_t>((sizeof(X) - 1)))
39
39
 
40
40
 
41
41
#endif /* DRIZZLED_LEX_STRING_H */