← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tztime.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tztime.h
32
32
# endif
33
33
#endif
34
34
 
35
 
#include "drizzled/sql_alloc.h"
 
35
#include "drizzled/memory/sql_alloc.h"
36
36
 
37
37
class String;
38
38
typedef struct st_drizzle_time DRIZZLE_TIME;
43
43
  Actual time zones which are specified by DB, or via offset
44
44
  or use system functions are its descendants.
45
45
*/
46
 
class Time_zone: public Sql_alloc
 
46
class Time_zone: public drizzled::memory::SqlAlloc
47
47
{
48
48
public:
49
49
  Time_zone() {}                              /* Remove gcc warning */
69
69
 
70
70
  /**
71
71
    We need this only for surpressing warnings, objects of this type are
72
 
    allocated on MEM_ROOT and should not require destruction.
 
72
    allocated on drizzled::memory::Root and should not require destruction.
73
73
  */
74
74
  virtual ~Time_zone() {};
75
75
};