Skip to content

Commit f83a90d

Browse files
gdsjaargsjaardema
authored andcommitted
ZOLTAN: Fix compiler warnings
1 parent 6322a56 commit f83a90d

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

packages/zoltan/src/phg/phg_match.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ static int pmatching_agg_ipm (ZZ *zz,
14611461
PHGPartParams *hgp)
14621462
{
14631463
int ierr = ZOLTAN_OK;
1464-
int i, j, n, m, round, vindex; /* loop counters */
1464+
int i, j, n, m, vindex; /* loop counters */
14651465
int sendcnt, sendsize, reccnt=0, recsize, msgsize; /* temp variables */
14661466
int nRounds; /* # of matching rounds to be performed; */
14671467
int nSend, /* working buffers and their sizes */
@@ -1650,7 +1650,7 @@ static int pmatching_agg_ipm (ZZ *zz,
16501650

16511651
vindex = 0; /* marks current position in visit array */
16521652
nRounds = 1;
1653-
for (round = 0; nRounds; ++round) {
1653+
for (round = 0; nRounds; ) {
16541654
MACRO_TIMER_START (1, "matching phase 1", 0);
16551655

16561656
/************************ PHASE 1: ****************************************/
@@ -1665,10 +1665,8 @@ static int pmatching_agg_ipm (ZZ *zz,
16651665
match[v] = -match[v] - 1;
16661666
}
16671667
}
1668-
/* uprintf(hgc, "Round %d: locCandCnt=%zd\n", round, locCandCnt); */
16691668

16701669
/* Send buffer: offset-to-ints, offset-to-floats, all gnos, all ints, all floats */
1671-
16721670
int_size = float_size = gno_size = 0;
16731671

16741672
for (i = 0; i < locCandCnt; i++) {

packages/zoltan/src/rcb/inertial.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ extern "C" {
2020

2121
extern void Zoltan_evals3(double[3][3], double *, double *, double *);
2222
extern double Zoltan_determinant(double[3][3]);
23-
extern void Zoltan_eigenvec3(double[3][3], double, double *, double *);
23+
extern void Zoltan_eigenvec3(double[3][3], double, double[3], double *);
2424

2525
extern void Zoltan_evals2(double[2][2], double *, double *);
26-
extern void Zoltan_eigenvec2(double[2][2], double, double *, double *);
26+
extern void Zoltan_eigenvec2(double[2][2], double, double[2], double *);
2727

2828
#ifdef __cplusplus
2929
} /* closing bracket for extern "C" */

packages/zoltan/src/rcb/rib.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ extern int Zoltan_RIB_Build_Structure(ZZ *, int *, int *, int, double, int,int);
4747

4848
/* function prototypes */
4949

50-
extern int Zoltan_RIB_inertial1d(struct Dot_Struct *, int *, int, int, double *, double *,
50+
extern int Zoltan_RIB_inertial1d(struct Dot_Struct *, int *, int, int, double[3], double[3],
5151
double *);
52-
extern int Zoltan_RIB_inertial2d(int, struct Dot_Struct *, int *, int, int, double *,
53-
double *, double *, MPI_Comm, int, int, int);
54-
extern int Zoltan_RIB_inertial3d(int, struct Dot_Struct *, int *, int, int, double *,
55-
double *, double *, MPI_Comm, int, int, int);
52+
extern int Zoltan_RIB_inertial2d(int, struct Dot_Struct *, int *, int, int, double[3],
53+
double[3], double *, MPI_Comm, int, int, int);
54+
extern int Zoltan_RIB_inertial3d(int, struct Dot_Struct *, int *, int, int, double[3],
55+
double[3], double *, MPI_Comm, int, int, int);
5656
extern void Zoltan_RIB_reduce_double(double *, double *, int, MPI_Comm, int, int, int,
5757
int);
5858

0 commit comments

Comments
 (0)