From 95ceb03938015eb7c389e534412242c310b537f0 Mon Sep 17 00:00:00 2001 From: degomme Date: Thu, 16 Mar 2017 14:52:06 +0100 Subject: [PATCH] Too advanced syntax for gcc 4.8, default to some other ... Don't like it, though. --- src/smpi/smpi_pmpi.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/smpi_pmpi.cpp index 696af304f2..7cedfd7235 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/smpi_pmpi.cpp @@ -2772,10 +2772,8 @@ MPI_Fint PMPI_Info_c2f(MPI_Info info){ } int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) { - smpi_copy_fn _copy_fn={}; - smpi_delete_fn _delete_fn={}; - _copy_fn.comm_copy_fn = copy_fn; - _delete_fn.comm_delete_fn = delete_fn; + smpi_copy_fn _copy_fn={copy_fn,nullptr,nullptr}; + smpi_delete_fn _delete_fn={delete_fn,nullptr,nullptr}; return Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); } @@ -2894,10 +2892,8 @@ int PMPI_Type_delete_attr (MPI_Datatype type, int type_keyval) int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state) { - smpi_copy_fn _copy_fn={}; - smpi_delete_fn _delete_fn={}; - _copy_fn.type_copy_fn = copy_fn; - _delete_fn.type_delete_fn = delete_fn; + smpi_copy_fn _copy_fn={nullptr,copy_fn,nullptr}; + smpi_delete_fn _delete_fn={nullptr,delete_fn,nullptr}; return Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); } @@ -2953,10 +2949,8 @@ int PMPI_Win_delete_attr (MPI_Win win, int type_keyval) int PMPI_Win_create_keyval(MPI_Win_copy_attr_function* copy_fn, MPI_Win_delete_attr_function* delete_fn, int* keyval, void* extra_state) { - smpi_copy_fn _copy_fn={}; - smpi_delete_fn _delete_fn={}; - _copy_fn.win_copy_fn = copy_fn; - _delete_fn.win_delete_fn = delete_fn; + smpi_copy_fn _copy_fn={nullptr, nullptr, copy_fn}; + smpi_delete_fn _delete_fn={nullptr, nullptr, delete_fn}; return Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); } -- 2.20.1