diff options
| author |  Jeremie Guichard <djebrest@gmail.com> | 2017-03-08 13:41:41 +0700 |
|---|---|---|
| committer | Jeremie Guichard <djebrest@gmail.com> | 2017-03-08 14:04:17 +0700 |
| commit | 406e4287eb96e10ddfd22163f0e863e353470c68 (patch) | |
| tree | 1a859821cdd37485b7d9ce4c0404f73fdf68e78b /core/statistics.c | |
| parent | 9c2619ea3bcf8a0ad40a758692c26a5aec350c7f (diff) | |
| download | subsurface-406e4287eb96e10ddfd22163f0e863e353470c68.tar.gz | |
Change calls to rint into lrint avoiding conversion warnings
Using gcc option "-Wfloat-conversion" is useful to catch
potential conversion errors (where lrint should be used).
rint returns double and still raises the same warning,
this is why this change updates all rint calls to lrint.
In few places, where input type is a float, corresponding
lrinf is used.
Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
Diffstat (limited to 'core/statistics.c')
| -rw-r--r-- | core/statistics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/statistics.c b/core/statistics.c index cb21961d4..b615cdef1 100644 --- a/core/statistics.c +++ b/core/statistics.c @@ -396,8 +396,8 @@ static void get_gas_parts(struct gasmix mix, volume_t vol, int o2_in_topup, volu return; } - air.mliter = rint(((double)vol.mliter * (1000 - get_he(&mix) - get_o2(&mix))) / (1000 - o2_in_topup)); - he->mliter = rint(((double)vol.mliter * get_he(&mix)) / 1000.0); + air.mliter = lrint(((double)vol.mliter * (1000 - get_he(&mix) - get_o2(&mix))) / (1000 - o2_in_topup)); + he->mliter = lrint(((double)vol.mliter * get_he(&mix)) / 1000.0); o2->mliter += vol.mliter - he->mliter - air.mliter; } |