← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/tztime.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/tztime.cc
25
25
#include "drizzled/session.h"
26
26
#include "drizzled/time_functions.h"
27
27
 
 
28
namespace drizzled
 
29
{
 
30
 
28
31
/* Structure describing local time type (e.g. Moscow summer time (MSD)) */
29
32
typedef struct ttinfo
30
33
{
835
838
time_t
836
839
Time_zone_db::TIME_to_gmt_sec(const DRIZZLE_TIME *t, bool *in_dst_time_gap) const
837
840
{
838
 
  return ::TIME_to_gmt_sec(t, tz_info, in_dst_time_gap);
 
841
  return ::drizzled::TIME_to_gmt_sec(t, tz_info, in_dst_time_gap);
839
842
}
840
843
 
841
844
 
851
854
void
852
855
Time_zone_db::gmt_sec_to_TIME(DRIZZLE_TIME *tmp, time_t t) const
853
856
{
854
 
  ::gmt_sec_to_TIME(tmp, t, tz_info);
 
857
  ::drizzled::gmt_sec_to_TIME(tmp, t, tz_info);
855
858
}
856
859
 
857
860
 
1010
1013
 
1011
1014
Time_zone *my_tz_SYSTEM= &tz_SYSTEM;
1012
1015
 
1013
 
class Tz_names_entry: public drizzled::memory::SqlAlloc
 
1016
class Tz_names_entry: public memory::SqlAlloc
1014
1017
{
1015
1018
public:
1016
1019
  String name;
1078
1081
{
1079
1082
  return NULL;
1080
1083
}
 
1084
 
 
1085
} /* namespace drizzled */