Save an indirection with smpi keyvals.

[simgrid.git] / src / smpi / mpi / smpi_keyvals.cpp

diff --git a/src/smpi/mpi/smpi_keyvals.cpp b/src/smpi/mpi/smpi_keyvals.cpp
index d43605b..8561a09 100644 (file)
--- a/src/smpi/mpi/smpi_keyvals.cpp
+++ b/src/smpi/mpi/smpi_keyvals.cpp
@@ -10,36 +10,34 @@
 namespace simgrid{
 namespace smpi{
 
-template <>
-int Keyval::call_deleter<Comm>(Comm* obj, const s_smpi_key_elem_t* elem, int keyval, void* value, int* /*flag*/)
+template <> int Keyval::call_deleter<Comm>(Comm* obj, const smpi_key_elem& elem, int keyval, void* value, int* /*flag*/)
 {
   int ret = MPI_SUCCESS;
-  if(elem->delete_fn.comm_delete_fn!=MPI_NULL_DELETE_FN)
-    ret = elem->delete_fn.comm_delete_fn(obj, keyval, value, elem->extra_state);
-  else if(elem->delete_fn.comm_delete_fn_fort!=MPI_NULL_DELETE_FN)
-    elem->delete_fn.comm_delete_fn_fort(obj, keyval, value, elem->extra_state, &ret);
+  if (elem.delete_fn.comm_delete_fn != MPI_NULL_DELETE_FN)
+    ret = elem.delete_fn.comm_delete_fn(obj, keyval, value, elem.extra_state);
+  else if (elem.delete_fn.comm_delete_fn_fort != MPI_NULL_DELETE_FN)
+    elem.delete_fn.comm_delete_fn_fort(obj, keyval, value, elem.extra_state, &ret);
   return ret;
 }
 
-template <>
-int Keyval::call_deleter<Win>(Win* obj, const s_smpi_key_elem_t* elem, int keyval, void* value, int* /*flag*/)
+template <> int Keyval::call_deleter<Win>(Win* obj, const smpi_key_elem& elem, int keyval, void* value, int* /*flag*/)
 {
   int ret = MPI_SUCCESS;
-  if(elem->delete_fn.win_delete_fn!=MPI_NULL_DELETE_FN)
-    ret = elem->delete_fn.win_delete_fn(obj, keyval, value, elem->extra_state);
-  else if(elem->delete_fn.win_delete_fn_fort!=MPI_NULL_DELETE_FN)
-    elem->delete_fn.win_delete_fn_fort(obj, keyval, value, elem->extra_state, &ret);
+  if (elem.delete_fn.win_delete_fn != MPI_NULL_DELETE_FN)
+    ret = elem.delete_fn.win_delete_fn(obj, keyval, value, elem.extra_state);
+  else if (elem.delete_fn.win_delete_fn_fort != MPI_NULL_DELETE_FN)
+    elem.delete_fn.win_delete_fn_fort(obj, keyval, value, elem.extra_state, &ret);
   return ret;
 }
 
 template <>
-int Keyval::call_deleter<Datatype>(Datatype* obj, const s_smpi_key_elem_t* elem, int keyval, void* value, int* /*flag*/)
+int Keyval::call_deleter<Datatype>(Datatype* obj, const smpi_key_elem& elem, int keyval, void* value, int* /*flag*/)
 {
   int ret = MPI_SUCCESS;
-  if(elem->delete_fn.type_delete_fn!=MPI_NULL_DELETE_FN)
-    ret = elem->delete_fn.type_delete_fn(obj, keyval, value, elem->extra_state);
-  else if(elem->delete_fn.type_delete_fn_fort!=MPI_NULL_DELETE_FN)
-    elem->delete_fn.type_delete_fn_fort(obj, keyval, value, elem->extra_state, &ret);
+  if (elem.delete_fn.type_delete_fn != MPI_NULL_DELETE_FN)
+    ret = elem.delete_fn.type_delete_fn(obj, keyval, value, elem.extra_state);
+  else if (elem.delete_fn.type_delete_fn_fort != MPI_NULL_DELETE_FN)
+    elem.delete_fn.type_delete_fn_fort(obj, keyval, value, elem.extra_state, &ret);
   return ret;
 }