Merge pull request open-mpi#7227 from wbailey2/pr/4.0.x/two_phase_support-fix

gpaulsen · web-flow · commit 3652cd93c5c6 · 2019-12-09T08:56:48.000-06:00
v4.0.x: fcoll/two_phase: Compiler warning for wrong variable type used
diff --git a/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c b/ompi/mca/fcoll/two_phase/fcoll_two_phase_support_fns.c
@@ -174,7 +174,7 @@ int mca_fcoll_two_phase_calc_aggregator(ompio_file_t *fh,
        fprintf(stderr,
 	       "Error in mca_fcoll_two_phase_calc_aggregator:");
        fprintf(stderr,
-	       "rank_index(%d) >= num_aggregators(%d) fd_size=%ld off=%ld min_off=%ld striping_unit=%d\n",
+	       "rank_index(%d) >= num_aggregators(%d) fd_size=%lld off=%lld min_off=%lld striping_unit=%d\n",
 	       rank_index, num_aggregators, fd_size, off, min_off, striping_unit);
        ompi_mpi_abort(&ompi_mpi_comm_world.comm, 1);
     }

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ int mca_fcoll_two_phase_calc_aggregator(ompio_file_t *fh,`
`174`	`174`	`fprintf(stderr,`
`175`	`175`	`"Error in mca_fcoll_two_phase_calc_aggregator:");`
`176`	`176`	`fprintf(stderr,`
`177`		`- "rank_index(%d) >= num_aggregators(%d) fd_size=%ld off=%ld min_off=%ld striping_unit=%d\n",`
	`177`	`+ "rank_index(%d) >= num_aggregators(%d) fd_size=%lld off=%lld min_off=%lld striping_unit=%d\n",`
`178`	`178`	`rank_index, num_aggregators, fd_size, off, min_off, striping_unit);`
`179`	`179`	`ompi_mpi_abort(&ompi_mpi_comm_world.comm, 1);`
`180`	`180`	`}`