Flush output of energy tests.

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

diff --git a/src/smpi/smpi_keyvals.hpp b/src/smpi/smpi_keyvals.hpp
index 7f461ba..92f3384 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,13 +6,10 @@
 #ifndef SMPI_KEYVALS_HPP_INCLUDED
 #define SMPI_KEYVALS_HPP_INCLUDED
 
-#include "private.h"
-#include <unordered_map>
-#include <xbt/ex.hpp>
-
-namespace simgrid{
-namespace smpi{
+#include "smpi/smpi.h"
+#include "xbt/ex.hpp"
 
+#include <unordered_map>
 
 typedef struct smpi_delete_fn{
   MPI_Comm_delete_attr_function          *comm_delete_fn;
@@ -32,8 +28,12 @@ typedef struct s_smpi_key_elem {
   smpi_delete_fn delete_fn;
   int refcount;
 } s_smpi_mpi_key_elem_t; 
+
 typedef struct s_smpi_key_elem *smpi_key_elem;
 
+namespace simgrid{
+namespace smpi{
+
 class Keyval{
   private:
     std::unordered_map<int, void*> attributes_;