VisualAge C++ V4.0 fixups, can't differentiate between time_t and double???
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -523,7 +523,10 @@ public:
|
||||
wxDateTime() { }
|
||||
|
||||
// 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);
|
||||
#endif
|
||||
// from broken down time/date (only for standard Unix range)
|
||||
inline wxDateTime(const struct tm& tm);
|
||||
// from broken down time/date (any range)
|
||||
@@ -558,8 +561,11 @@ public:
|
||||
// set to the current time
|
||||
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
|
||||
inline wxDateTime& Set(time_t timet);
|
||||
#endif
|
||||
|
||||
// set to given broken down time/date
|
||||
wxDateTime& Set(const struct tm& tm);
|
||||
|
@@ -62,6 +62,7 @@ wxDateTime wxDateTime::Today()
|
||||
return wxDateTime(*tm);
|
||||
}
|
||||
|
||||
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
|
||||
wxDateTime& wxDateTime::Set(time_t timet)
|
||||
{
|
||||
// assign first to avoid long multiplication overflow!
|
||||
@@ -70,16 +71,19 @@ wxDateTime& wxDateTime::Set(time_t timet)
|
||||
|
||||
return *this;
|
||||
}
|
||||
#endif
|
||||
|
||||
wxDateTime& wxDateTime::SetToCurrent()
|
||||
{
|
||||
return *this = Now();
|
||||
}
|
||||
|
||||
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
|
||||
wxDateTime::wxDateTime(time_t timet)
|
||||
{
|
||||
Set(timet);
|
||||
}
|
||||
#endif
|
||||
|
||||
wxDateTime::wxDateTime(const struct tm& tm)
|
||||
{
|
||||
|
Reference in New Issue
Block a user