niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "cast time at macro expansion (#86)" (#87)

Browse source 
This reverts commit 5fe6c528f3.
This commit is contained in:
Mikael Arguedas 2016-11-04 11:36:15 -07:00 • committed by GitHub
parent 5fe6c528f3
commit 545cb5602c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rcl/include/rcl/time.h
View file

@ -24,9 +24,9 @@ extern "C"
#include "rcl/types.h"
#include "rcl/visibility_control.h"
#define RCL_S_TO_NS(seconds) ((int64_t)seconds * (1000 * 1000 * 1000))
#define RCL_MS_TO_NS(milliseconds) ((int64_t)milliseconds * (1000 * 1000))
#define RCL_US_TO_NS(microseconds) ((int64_t)microseconds * 1000)
#define RCL_S_TO_NS(seconds) (seconds * (1000 * 1000 * 1000))
#define RCL_MS_TO_NS(milliseconds) (milliseconds * (1000 * 1000))
#define RCL_US_TO_NS(microseconds) (microseconds * 1000)
#define RCL_NS_TO_S(nanoseconds) (nanoseconds / (1000 * 1000 * 1000))
#define RCL_NS_TO_MS(nanoseconds) (nanoseconds / (1000 * 1000))

4
rcl/src/rcl/time_unix.c
View file

@ -66,7 +66,7 @@ rcl_system_time_now(rcl_time_point_value_t * now)
RCL_SET_ERROR_MSG("unexpected negative time");
return RCL_RET_ERROR;
}
*now = RCL_S_TO_NS(timespec_now.tv_sec) + timespec_now.tv_nsec;
*now = RCL_S_TO_NS((uint64_t)timespec_now.tv_sec) + timespec_now.tv_nsec;
return RCL_RET_OK;
}
@ -97,7 +97,7 @@ rcl_steady_time_now(rcl_time_point_value_t * now)
RCL_SET_ERROR_MSG("unexpected negative time");
return RCL_RET_ERROR;
}
*now = RCL_S_TO_NS(timespec_now.tv_sec) + timespec_now.tv_nsec;
*now = RCL_S_TO_NS((uint64_t)timespec_now.tv_sec) + timespec_now.tv_nsec;
return RCL_RET_OK;
}