← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/conv_charset.h

Merged Nathan from lp:~nlws/drizzle/fix-string-c-ptr-overrun

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/conv_charset.h
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#ifndef DRIZZLED_FUNCTIONS_STR_CONV_CHARSET_H
21
 
#define DRIZZLED_FUNCTIONS_STR_CONV_CHARSET_H
 
20
#ifndef DRIZZLED_FUNCTION_STR_CONV_CHARSET_H
 
21
#define DRIZZLED_FUNCTION_STR_CONV_CHARSET_H
22
22
 
23
 
#include <drizzled/functions/str/strfunc.h> 
 
23
#include <drizzled/function/str/strfunc.h>
24
24
 
25
25
class Item_func_conv_charset :public Item_str_func
26
26
{
65
65
  virtual void print(String *str, enum_query_type query_type);
66
66
};
67
67
 
68
 
#endif /* DRIZZLED_FUNCTIONS_STR_CONV_CHARSET_H */
 
68
#endif /* DRIZZLED_FUNCTION_STR_CONV_CHARSET_H */