Merge branches 'master' and 'master' of github.com:simgrid/simgrid

[simgrid.git] / src / smpi / smpi_keyvals.hpp

diff --git a/src/smpi/smpi_keyvals.hpp b/src/smpi/smpi_keyvals.hpp
index c302a55..52ad77e 100644 (file)
--- 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 <unordered_map>
-#include <xbt/ex.hpp>
 
 typedef struct smpi_delete_fn{
   MPI_Comm_delete_attr_function          *comm_delete_fn;
@@ -137,7 +137,7 @@ template <typename T> int Keyval::attr_put(int keyval, void* attr_value){
 }
 
 template <typename T> void Keyval::cleanup_attr(){
-  if(!attributes()->empty()){
+  if (not attributes()->empty()) {
     int flag=0;
     for(auto it : attributes_){
       try{