Changeset: 51199f904f7e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/51199f904f7e
Modified Files:
sql/backends/monet5/sql_time.c
Branch: cleanup_types
Log Message:
more windows fixes
diffs (57 lines):
diff --git a/sql/backends/monet5/sql_time.c b/sql/backends/monet5/sql_time.c
--- a/sql/backends/monet5/sql_time.c
+++ b/sql/backends/monet5/sql_time.c
@@ -372,7 +372,7 @@ str_2time_daytimetz_internal(ptr out, pt
ret[i] = daytime_nil;
nils = true;
} else {
- msg =
str_2time_daytimetz_internal_imp(&(ret[i]), next, fromstr_func, shift, divider,
multiplier, tz/1000);
+ msg =
str_2time_daytimetz_internal_imp(&(ret[i]), next, fromstr_func, shift, divider,
multiplier, (long)(tz/1000));
}
}
} else {
@@ -384,7 +384,7 @@ str_2time_daytimetz_internal(ptr out, pt
ret[i] = daytime_nil;
nils = true;
} else {
- msg =
str_2time_daytimetz_internal_imp(&(ret[i]), next, fromstr_func, shift, divider,
multiplier, tz/1000);
+ msg =
str_2time_daytimetz_internal_imp(&(ret[i]), next, fromstr_func, shift, divider,
multiplier, (long)(tz/1000));
}
}
}
@@ -394,7 +394,7 @@ str_2time_daytimetz_internal(ptr out, pt
if (strNil(next))
*ret = daytime_nil;
else
- msg = str_2time_daytimetz_internal_imp(ret, next,
fromstr_func, shift, divider, multiplier, tz/1000);
+ msg = str_2time_daytimetz_internal_imp(ret, next,
fromstr_func, shift, divider, multiplier, (long)(tz/1000));
}
bailout:
@@ -873,7 +873,7 @@ str_2time_timestamptz_internal(ptr out,
ret[i] = timestamp_nil;
nils = true;
} else {
- msg =
str_2time_timestamptz_internal_imp(&(ret[i]), next, fromstr_func, shift,
divider, multiplier, tz/1000);
+ msg =
str_2time_timestamptz_internal_imp(&(ret[i]), next, fromstr_func, shift,
divider, multiplier, (long)(tz/1000));
}
}
} else {
@@ -885,7 +885,7 @@ str_2time_timestamptz_internal(ptr out,
ret[i] = timestamp_nil;
nils = true;
} else {
- msg =
str_2time_timestamptz_internal_imp(&(ret[i]), next, fromstr_func, shift,
divider, multiplier, tz/1000);
+ msg =
str_2time_timestamptz_internal_imp(&(ret[i]), next, fromstr_func, shift,
divider, multiplier, (long)(tz/1000));
}
}
}
@@ -895,7 +895,7 @@ str_2time_timestamptz_internal(ptr out,
if (strNil(next))
*ret = timestamp_nil;
else
- msg = str_2time_timestamptz_internal_imp(ret, next,
fromstr_func, shift, divider, multiplier, tz/1000);
+ msg = str_2time_timestamptz_internal_imp(ret, next,
fromstr_func, shift, divider, multiplier, (long)(tz/1000));
}
bailout:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
