{
WORD First;
int weekofmonth = compareDate->wDay;
- First = ( 6 + compareDate->wDayOfWeek - date->wDayOfWeek + date->wDay ) % 7 + 1;
+ First = (WORD)(( 6 + compareDate->wDayOfWeek - date->wDayOfWeek + date->wDay ) % 7 + 1);
limit_day = First + 7 * (weekofmonth - 1);
if(limit_day > monthLengths[date->wMonth==2 && ISLEAP(date->wYear)][date->wMonth - 1])
limit_day -= 7;
public class Time : double
{
- char * OnGetString(char * tempString, void * fieldData, bool * needClass)
+ const char * OnGetString(char * tempString, void * fieldData, bool * needClass)
{
Time time = this;
int value;
public class SecSince1970 : int64
{
- char * OnGetString(char * tempString, void * fieldData, bool * needClass)
+ const char * OnGetString(char * tempString, void * fieldData, bool * needClass)
{
return ((DateTime)this).OnGetString(tempString, fieldData, needClass);
}
+ bool OnGetDataFromString(const char * string)
+ {
+ DateTime dt { };
+ if(dt.OnGetDataFromString(string))
+ {
+ this = dt;
+ return true;
+ }
+ return false;
+ }
+
// Is this required?
int OnCompare(SecSince1970 data2)
{
{
#if defined(__WIN32__)
SYSTEMTIME localTime, systemTime;
- FILETIME fileTime, localFileTime;
+ //FILETIME fileTime, localFileTime;
DateTime input, global;
input = this;
localTime.wYear = (short)input.year;
- localTime.wMonth = (short)input.month + 1;
+ localTime.wMonth = (short)(input.month + 1);
localTime.wDay = (short)input.day;
localTime.wHour = (short)input.hour;
localTime.wMinute = (short)input.minute;
utc = this;
systemTime.wYear = (short)utc.year;
- systemTime.wMonth = (short)utc.month + 1;
+ systemTime.wMonth = (short)(utc.month + 1);
systemTime.wDay = (short)utc.day;
systemTime.wHour = (short)utc.hour;
systemTime.wMinute = (short)utc.minute;
public class TimeStamp32 : uint32
{
public:
- char * OnGetString(char * tempString, void * fieldData, bool * needClass)
+ const char * OnGetString(char * tempString, void * fieldData, bool * needClass)
{
- return ((DateTime)this).OnGetString(tempString, fieldData, needClass);
+ return ((DateTime)(TimeStamp)this).OnGetString(tempString, fieldData, needClass);
}
// Is this required?
FILETIME fileTime, localFileTime;
localTime.wYear = (short)year;
- localTime.wMonth = (short)month + 1;
+ localTime.wMonth = (short)(month + 1);
localTime.wDay = (short)day;
localTime.wHour = (short)hour;
localTime.wMinute = (short)minute;
SYSTEMTIME systemTime, localTime;
systemTime.wYear = (short)year;
- systemTime.wMonth = (short)month + 1;
+ systemTime.wMonth = (short)(month + 1);
systemTime.wDay = (short)day;
systemTime.wHour = (short)hour;
systemTime.wMinute = (short)minute;
get { value = Date { year, month, day }; }
}
- char * OnGetString(char * stringOutput, void * fieldData, bool * needClass)
+ const char * OnGetString(char * stringOutput, void * fieldData, bool * needClass)
{
static const char ampm[2][3] = { "AM", "PM" };
int hour = this.hour;
return stringOutput;
}
- bool OnGetDataFromString(char * string)
+ bool OnGetDataFromString(const char * string)
{
char * s = CopyString(string);
char * tokens[20];
int c;
bool foundDayOfTheWeek = false;
bool foundDate = false;
- DayOfTheWeek dayOfTheWeek;
+ DayOfTheWeek dayOfTheWeek = 0;
int day = 0;
int minute = 0;
int second = 0;