← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_string.h

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_string.h
34
34
#define NOT_FIXED_DEC                   (uint8_t)31
35
35
#endif
36
36
 
37
 
namespace drizzled
38
 
{
39
 
 
40
 
class String;
41
 
struct charset_info_st;
 
37
namespace drizzled {
42
38
 
43
39
extern DRIZZLED_API String my_empty_string;
44
40
extern const String my_null_string;
45
 
namespace memory { class Root; }
46
41
 
47
42
DRIZZLED_API std::string String_to_std_string(String const& s);
48
43
DRIZZLED_API String* set_String_from_std_string(String* s, std::string const& cs);