X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..61427a88a76a2c2ef25d0d5b8132995c6f550e5c:/src/smpi/smpi_keyvals.hpp diff --git a/src/smpi/smpi_keyvals.hpp b/src/smpi/smpi_keyvals.hpp index c302a55667..bc3e2af943 100644 --- a/src/smpi/smpi_keyvals.hpp +++ b/src/smpi/smpi_keyvals.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2010, 2013-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,9 +6,10 @@ #ifndef SMPI_KEYVALS_HPP_INCLUDED #define SMPI_KEYVALS_HPP_INCLUDED -#include "private.h" +#include "smpi/smpi.h" +#include "xbt/ex.hpp" + #include -#include typedef struct smpi_delete_fn{ MPI_Comm_delete_attr_function *comm_delete_fn; @@ -27,7 +27,7 @@ typedef struct s_smpi_key_elem { smpi_copy_fn copy_fn; smpi_delete_fn delete_fn; int refcount; -} s_smpi_mpi_key_elem_t; +} s_smpi_mpi_key_elem_t; typedef struct s_smpi_key_elem *smpi_key_elem; @@ -40,7 +40,7 @@ class Keyval{ protected: std::unordered_map* attributes(); public: -// Each subclass should have two members, as we want to separate the ones for Win, Comm, and Datatypes : +// Each subclass should have two members, as we want to separate the ones for Win, Comm, and Datatypes : // static std::unordered_map keyvals_; // static int keyval_id_; template static int keyval_create(smpi_copy_fn copy_fn, smpi_delete_fn delete_fn, int* keyval, void* extra_statee); @@ -137,7 +137,7 @@ template int Keyval::attr_put(int keyval, void* attr_value){ } template void Keyval::cleanup_attr(){ - if(!attributes()->empty()){ + if (not attributes()->empty()) { int flag=0; for(auto it : attributes_){ try{