Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VisualAge C++ V4.0 fixups, can't differentiate between time_t and double???

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-01-03 23:31:12 +00:00
parent 7ab9bf9f2d
commit 16ee521a22
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/datetime.h
View File

@@ -523,7 +523,10 @@ public:
wxDateTime() { } wxDateTime() { }
// from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970) // from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration
inline wxDateTime(time_t timet); inline wxDateTime(time_t timet);
#endif
// from broken down time/date (only for standard Unix range) // from broken down time/date (only for standard Unix range)
inline wxDateTime(const struct tm& tm); inline wxDateTime(const struct tm& tm);
// from broken down time/date (any range) // from broken down time/date (any range)
@@ -558,8 +561,11 @@ public:
// set to the current time // set to the current time
inline wxDateTime& SetToCurrent(); inline wxDateTime& SetToCurrent();
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
// VA C++ confuses this with wxDateTime(double jdn) thinking it is a duplicate declaration
// set to given time_t value // set to given time_t value
inline wxDateTime& Set(time_t timet); inline wxDateTime& Set(time_t timet);
#endif
// set to given broken down time/date // set to given broken down time/date
wxDateTime& Set(const struct tm& tm); wxDateTime& Set(const struct tm& tm);
@@ -763,28 +769,28 @@ public:
inline time_t GetTicks() const; inline time_t GetTicks() const;
// get the year (returns Inv_Year if date is invalid) // get the year (returns Inv_Year if date is invalid)
int GetYear(const TimeZone& tz = Local) const int GetYear(const TimeZone& tz = Local) const
{ return GetTm(tz).year; } { return GetTm(tz).year; }
// get the month (Inv_Month if date is invalid) // get the month (Inv_Month if date is invalid)
Month GetMonth(const TimeZone& tz = Local) const Month GetMonth(const TimeZone& tz = Local) const
{ return (Month)GetTm(tz).mon; } { return (Month)GetTm(tz).mon; }
// get the month day (in 1..31 range, 0 if date is invalid) // get the month day (in 1..31 range, 0 if date is invalid)
wxDateTime_t GetDay(const TimeZone& tz = Local) const wxDateTime_t GetDay(const TimeZone& tz = Local) const
{ return GetTm(tz).mday; } { return GetTm(tz).mday; }
// get the day of the week (Inv_WeekDay if date is invalid) // get the day of the week (Inv_WeekDay if date is invalid)
WeekDay GetWeekDay(const TimeZone& tz = Local) const WeekDay GetWeekDay(const TimeZone& tz = Local) const
{ return GetTm(tz).GetWeekDay(); } { return GetTm(tz).GetWeekDay(); }
// get the hour of the day // get the hour of the day
wxDateTime_t GetHour(const TimeZone& tz = Local) const wxDateTime_t GetHour(const TimeZone& tz = Local) const
{ return GetTm(tz).hour; } { return GetTm(tz).hour; }
// get the minute // get the minute
wxDateTime_t GetMinute(const TimeZone& tz = Local) const wxDateTime_t GetMinute(const TimeZone& tz = Local) const
{ return GetTm(tz).min; } { return GetTm(tz).min; }
// get the second // get the second
wxDateTime_t GetSecond(const TimeZone& tz = Local) const wxDateTime_t GetSecond(const TimeZone& tz = Local) const
{ return GetTm(tz).sec; } { return GetTm(tz).sec; }
// get milliseconds // get milliseconds
wxDateTime_t GetMillisecond(const TimeZone& tz = Local) const wxDateTime_t GetMillisecond(const TimeZone& tz = Local) const
{ return GetTm(tz).msec; } { return GetTm(tz).msec; }
// get the day since the year start (1..366, 0 if date is invalid) // get the day since the year start (1..366, 0 if date is invalid)

4
include/wx/datetime.inl
View File

@@ -62,6 +62,7 @@ wxDateTime wxDateTime::Today()
return wxDateTime(*tm); return wxDateTime(*tm);
} }
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
wxDateTime& wxDateTime::Set(time_t timet) wxDateTime& wxDateTime::Set(time_t timet)
{ {
// assign first to avoid long multiplication overflow! // assign first to avoid long multiplication overflow!
@@ -70,16 +71,19 @@ wxDateTime& wxDateTime::Set(time_t timet)
return *this; return *this;
} }
#endif
wxDateTime& wxDateTime::SetToCurrent() wxDateTime& wxDateTime::SetToCurrent()
{ {
return *this = Now(); return *this = Now();
} }
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
wxDateTime::wxDateTime(time_t timet) wxDateTime::wxDateTime(time_t timet)
{ {
Set(timet); Set(timet);
} }
#endif
wxDateTime::wxDateTime(const struct tm& tm) wxDateTime::wxDateTime(const struct tm& tm)
{ {