mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence compiler warnings

Browse source 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-02-01 18:00:49 -08:00 • committed by Dirk Hohndel
parent fdd5ee507c
commit c32f5cc278
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsurface-core/divelist.c
View file

@ -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 // renumber dives from merged one in advance by difference between
// merged dives numbers. Do not renumber if actual number is zero. // 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) if (!dive_table.dives[j]->number == 0)
dive_table.dives[j]->number -= factor; dive_table.dives[j]->number -= factor;

4
subsurface-core/profile.h
View file

@ -1,12 +1,12 @@
#ifndef PROFILE_H #ifndef PROFILE_H
#define PROFILE_H #define PROFILE_H
#include "dive.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "dive.h"
typedef enum { typedef enum {
STABLE, STABLE,
SLOW, SLOW,

4
tests/testunitconversion.cpp
View file

@ -17,8 +17,8 @@ void TestUnitConversion::testUnitConversions()
QCOMPARE(IS_FP_SAME(psi_to_bar(14.6959488), 1.01325), true); QCOMPARE(IS_FP_SAME(psi_to_bar(14.6959488), 1.01325), true);
QCOMPARE(psi_to_mbar(14.6959488), (long)1013); QCOMPARE(psi_to_mbar(14.6959488), (long)1013);
QCOMPARE(to_PSI((pressure_t){ 1013 }), (int)15); QCOMPARE(to_PSI((pressure_t){ 1013 }), (int)15);
QCOMPARE(IS_FP_SAME(bar_to_atm(1.013), 1), true); QCOMPARE(IS_FP_SAME(bar_to_atm(1.013), 1.0), true);
QCOMPARE(IS_FP_SAME(mbar_to_atm(1013), 1), true); QCOMPARE(IS_FP_SAME(mbar_to_atm(1013), 1.0), true);
QCOMPARE(mbar_to_PSI(1013), (int)15); QCOMPARE(mbar_to_PSI(1013), (int)15);
get_units(); get_units();
} }