From 2f57b698220dcc9d737edb2ea7d0674223e9c082 Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Fri, 27 May 2016 10:14:02 -0600 Subject: [PATCH 1/3] win: fix warnings Signed-off-by: Nathan Hjelm (cherry picked from commit 0adfb328e182709d7eb44f6fa318289d077ff159) --- ompi/win/win.c | 2 +- ompi/win/win.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ompi/win/win.c b/ompi/win/win.c index 000ec9e8f29..6809ad77c11 100644 --- a/ompi/win/win.c +++ b/ompi/win/win.c @@ -46,7 +46,7 @@ opal_pointer_array_t ompi_mpi_windows = {{0}}; ompi_predefined_win_t ompi_mpi_win_null = {{{0}}}; ompi_predefined_win_t *ompi_mpi_win_null_addr = &ompi_mpi_win_null; mca_base_var_enum_t *ompi_win_accumulate_ops = NULL; -mca_base_var_enum_t *ompi_win_accumulate_order = NULL; +mca_base_var_enum_flag_t *ompi_win_accumulate_order = NULL; static mca_base_var_enum_value_t accumulate_ops_values[] = { {.value = OMPI_WIN_ACCUMULATE_OPS_SAME_OP_NO_OP, .string = "same_op_no_op",}, diff --git a/ompi/win/win.h b/ompi/win/win.h index 07daab04295..ab4af8fc43e 100644 --- a/ompi/win/win.h +++ b/ompi/win/win.h @@ -68,7 +68,7 @@ enum ompi_win_accumulate_order_flags_t { }; OMPI_DECLSPEC extern mca_base_var_enum_t *ompi_win_accumulate_ops; -OMPI_DECLSPEC extern mca_base_var_enum_t *ompi_win_accumulate_order; +OMPI_DECLSPEC extern mca_base_var_enum_flag_t *ompi_win_accumulate_order; OMPI_DECLSPEC extern opal_pointer_array_t ompi_mpi_windows; From 95fbacbec72b3ea5569ed2c3e83d14668ce2fc08 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 31 May 2016 13:03:20 +0900 Subject: [PATCH 2/3] ompi/win: silence warning (cherry picked from commit c41321b9e5aad4eb6827926be668bc3a5896cb14) --- ompi/win/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/win/win.c b/ompi/win/win.c index 6809ad77c11..e76452f410f 100644 --- a/ompi/win/win.c +++ b/ompi/win/win.c @@ -161,7 +161,7 @@ static int alloc_window(struct ompi_communicator_t *comm, ompi_info_t *info, int ret = ompi_info_get_value_enum (info, "accumulate_order", &acc_order, OMPI_WIN_ACC_ORDER_RAR | OMPI_WIN_ACC_ORDER_WAR | OMPI_WIN_ACC_ORDER_RAW | OMPI_WIN_ACC_ORDER_WAW, - ompi_win_accumulate_order, &flag); + &(ompi_win_accumulate_order->super), &flag); if (OMPI_SUCCESS != ret) { OBJ_RELEASE(win); return ret; From 4d67de7360e1b98e856cdf32fbe4f02121a17779 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 31 May 2016 13:18:39 +0900 Subject: [PATCH 3/3] ompi/win: silence an other warning (cherry picked from commit 1bbc5fadee511dff81417e7015a9c60eaf050946) --- ompi/win/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/win/win.c b/ompi/win/win.c index e76452f410f..3b3d2b9ba04 100644 --- a/ompi/win/win.c +++ b/ompi/win/win.c @@ -61,7 +61,7 @@ static mca_base_var_enum_value_flag_t accumulate_order_flags[] = { {.flag = OMPI_WIN_ACC_ORDER_WAR, .string = "war", .conflicting_flag = OMPI_WIN_ACC_ORDER_NONE}, {.flag = OMPI_WIN_ACC_ORDER_RAW, .string = "raw", .conflicting_flag = OMPI_WIN_ACC_ORDER_NONE}, {.flag = OMPI_WIN_ACC_ORDER_WAW, .string = "waw", .conflicting_flag = OMPI_WIN_ACC_ORDER_NONE}, - {}, + {0}, }; static void ompi_win_construct(ompi_win_t *win);