Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/smpi/smpi_info.hpp b/src/smpi/smpi_info.hpp
index 8e1f525..5eb096d 100644 (file)
--- a/src/smpi/smpi_info.hpp
+++ b/src/smpi/smpi_info.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,9 +7,9 @@
 #ifndef SMPI_INFO_HPP
 #define SMPI_INFO_HPP
 
-#include <xbt/base.h>
-
-#include "private.h"
+#include "src/smpi/smpi_f2c.hpp"
+#include "smpi/smpi.h"
+#include "xbt/dict.h"
 
 namespace simgrid{
 namespace smpi{
@@ -19,12 +19,10 @@ class Info : public F2C{
     xbt_dict_t dict_;
     int refcount_;
   public:
-    static MPI_Info null_id_;
-
-    Info();
-    Info(Info* orig);
+    explicit Info();
+    explicit Info(Info* orig);
     ~Info();
-    static void ref(MPI_Info info);
+    void ref();
     static void unref(MPI_Info info);
     void set(char *key, char *value);
     int get(char *key,int valuelen, char *value, int *flag);
@@ -32,6 +30,7 @@ class Info : public F2C{
     int get_nkeys(int *nkeys);
     int get_nthkey(int n, char *key);
     int get_valuelen(char *key, int *valuelen, int *flag);
+    static Info* f2c(int id);
 };
 
 }