mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 19:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: removed clang warnings from units.h

Browse source 
lbs_to_grams and to_feet returns int but uses
a function that returns long, causing clang to
warn about conversion loss due to implicit conversion.

Adding a cast, shows that it is correct.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-05-18 17:23:51 +02:00 • committed by Lubomir I. Ivanov
parent 10cabcdb69
commit 262e994bbc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/units.h
View file

@ -146,7 +146,7 @@ static inline double grams_to_lbs(int grams)
static inline int lbs_to_grams(double lbs)
{
return lrint(lbs * 453.6);
return (int)lrint(lbs * 453.6);
}
static inline double ml_to_cuft(int ml)
@ -176,7 +176,7 @@ static inline unsigned long feet_to_mm(double feet)
static inline int to_feet(depth_t depth)
{
return lrint(mm_to_feet(depth.mm));
return (int)lrint(mm_to_feet(depth.mm));
}
static inline double mkelvin_to_C(int mkelvin)
@ -211,7 +211,7 @@ static inline long psi_to_mbar(double psi)
static inline int to_PSI(pressure_t pressure)
{
return lrint(pressure.mbar * 0.0145037738);
return (int)lrint(pressure.mbar * 0.0145037738);
}
static inline double bar_to_atm(double bar)