diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2016-02-01 18:00:49 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-02-01 18:01:05 -0800 |
| commit | c32f5cc2786744ef0f2971a40bfe00b11ca3d9e1 (patch) | |
| tree | bf3cce593a1b3ac250830284cc8c2baa636ee610 | |
| parent | fdd5ee507c31a700ac8547efedd3b89eb9a74f85 (diff) | |
| download | subsurface-c32f5cc2786744ef0f2971a40bfe00b11ca3d9e1.tar.gz | |
Silence compiler warnings
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-core/divelist.c | 2 | ||||
| -rw-r--r-- | subsurface-core/profile.h | 4 | ||||
| -rw-r--r-- | tests/testunitconversion.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/subsurface-core/divelist.c b/subsurface-core/divelist.c index 7ae5e8373..400867882 100644 --- a/subsurface-core/divelist.c +++ b/subsurface-core/divelist.c @@ -854,7 +854,7 @@ struct dive *merge_two_dives(struct dive *a, struct dive *b) // renumber dives from merged one in advance by difference between // merged dives numbers. Do not renumber if actual number is zero. - for (j; j < dive_table.nr; j++) + for (; j < dive_table.nr; j++) if (!dive_table.dives[j]->number == 0) dive_table.dives[j]->number -= factor; diff --git a/subsurface-core/profile.h b/subsurface-core/profile.h index 71929f8e3..abac9dd49 100644 --- a/subsurface-core/profile.h +++ b/subsurface-core/profile.h @@ -1,12 +1,12 @@ #ifndef PROFILE_H #define PROFILE_H +#include "dive.h" + #ifdef __cplusplus extern "C" { #endif -#include "dive.h" - typedef enum { STABLE, SLOW, diff --git a/tests/testunitconversion.cpp b/tests/testunitconversion.cpp index 3adf975c4..8e64fdd85 100644 --- a/tests/testunitconversion.cpp +++ b/tests/testunitconversion.cpp @@ -17,8 +17,8 @@ void TestUnitConversion::testUnitConversions() QCOMPARE(IS_FP_SAME(psi_to_bar(14.6959488), 1.01325), true); QCOMPARE(psi_to_mbar(14.6959488), (long)1013); QCOMPARE(to_PSI((pressure_t){ 1013 }), (int)15); - QCOMPARE(IS_FP_SAME(bar_to_atm(1.013), 1), true); - QCOMPARE(IS_FP_SAME(mbar_to_atm(1013), 1), true); + QCOMPARE(IS_FP_SAME(bar_to_atm(1.013), 1.0), true); + QCOMPARE(IS_FP_SAME(mbar_to_atm(1013), 1.0), true); QCOMPARE(mbar_to_PSI(1013), (int)15); get_units(); } |