← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/temporal.cc

  • Committer: Monty Taylor
  • Date: 2010-02-11 01:35:55 UTC
  • mfrom: (1289 staging)
  • mto: This revision was merged to the branch mainline in revision 1293.
  • Revision ID: mordred@inaugust.com-20100211013555-f9okqsgi91mwm4xu
Merged up with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/temporal.cc
54
54
#include <vector>
55
55
#include <string.h>
56
56
 
57
 
extern std::vector<drizzled::TemporalFormat *> known_datetime_formats;
58
 
extern std::vector<drizzled::TemporalFormat *> known_date_formats;
59
 
extern std::vector<drizzled::TemporalFormat *> known_time_formats;
60
 
 
61
57
namespace drizzled 
62
58
{
63
59
 
 
60
extern std::vector<TemporalFormat *> known_datetime_formats;
 
61
extern std::vector<TemporalFormat *> known_date_formats;
 
62
extern std::vector<TemporalFormat *> known_time_formats;
 
63
 
64
64
Temporal::Temporal()
65
65
:
66
66
  _calendar(GREGORIAN)
206
206
 * This operator is called in the following situation:
207
207
 *
208
208
 * @code
209
 
 * drizzled::Time lhs;
 
209
 * Time lhs;
210
210
 * lhs.from_string("20:00:00");
211
 
 * drizzled::Time rhs;
 
211
 * Time rhs;
212
212
 * rhs.from_string("19:00:00");
213
213
 *
214
 
 * drizzled::Time result= lhs - rhs;
 
214
 * Time result= lhs - rhs;
215
215
 * @endcode
216
216
 *
217
217
 * @note
1577
1577
      && (_nseconds <= UINT32_C(999999999));
1578
1578
}
1579
1579
 
1580
 
} /* end namespace drizzled */
 
1580
} /* namespace drizzled */