mirror of
https://github.com/fltk/fltk.git
synced 2026-05-28 11:25:22 +08:00
Fix Windows (MSVC) compiler warnings
warning C4244: '=': conversion from 'double' to 'time_t', possible loss of data warning C4244: 'return': conversion from 'time_t' to 'long', possible loss of data
This commit is contained in:
+3
-3
@@ -78,8 +78,8 @@ Fl_Timestamp Fl::now(double offset) {
|
|||||||
ts.sec = sec;
|
ts.sec = sec;
|
||||||
ts.usec = usec;
|
ts.usec = usec;
|
||||||
if (offset) {
|
if (offset) {
|
||||||
sec = trunc(offset);
|
sec = (time_t)trunc(offset);
|
||||||
usec = (offset - sec) * 1000000;
|
usec = int((offset - sec) * 1000000);
|
||||||
ts.sec += sec;
|
ts.sec += sec;
|
||||||
if (usec + ts.usec >= 1000000) {
|
if (usec + ts.usec >= 1000000) {
|
||||||
ts.sec++;
|
ts.sec++;
|
||||||
@@ -148,7 +148,7 @@ long Fl::ticks_since(Fl_Timestamp& then) {
|
|||||||
\see Fl::ticks_since(Fl_Timestamp& then) \see Fl::now()
|
\see Fl::ticks_since(Fl_Timestamp& then) \see Fl::now()
|
||||||
*/
|
*/
|
||||||
long Fl::ticks_between(Fl_Timestamp& back, Fl_Timestamp& further_back) {
|
long Fl::ticks_between(Fl_Timestamp& back, Fl_Timestamp& further_back) {
|
||||||
return (back.sec-further_back.sec)*60 + (back.usec-further_back.usec)/16666;
|
return long((back.sec-further_back.sec)*60 + (back.usec-further_back.usec)/16666);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user