Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/smpi/mpi/smpi_info.cpp b/src/smpi/mpi/smpi_info.cpp
index 9ac105a..73a323e 100644 (file)
--- a/src/smpi/mpi/smpi_info.cpp
+++ b/src/smpi/mpi/smpi_info.cpp
@@ -1,21 +1,16 @@
-/* Copyright (c) 2007-2018. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2019. 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. */
 
 #include "smpi_info.hpp"
 
 /* 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. */
 
 #include "smpi_info.hpp"

-#include "xbt/ex.hpp"
-#include "xbt/sysdep.h"
+#include "simgrid/Exception.hpp"

 
 

-namespace simgrid{
-namespace smpi{
+namespace simgrid {
+namespace smpi {

 
 

-Info::Info(Info* info) : map_(info->map_)
+void Info::ref()

 {
 {

-}
-
-void Info::ref(){

   refcount_++;
 }
 
   refcount_++;
 }
 


@@ -26,11 +21,7 @@ void Info::unref(Info* info){
   }
 }
 
   }
 }
 

-void Info::set(char *key, char *value){
-  map_[key] = value;
-}
-
-int Info::get(char *key, int valuelen, char *value, int *flag){
+int Info::get(const char *key, int valuelen, char *value, int *flag){

   *flag=false;
   auto val = map_.find(key);
   if (val != map_.end()) {
   *flag=false;
   auto val = map_.find(key);
   if (val != map_.end()) {


@@ -46,7 +37,7 @@ int Info::get(char *key, int valuelen, char *value, int *flag){
   }
 }
 
   }
 }
 

-int Info::remove(char *key){
+int Info::remove(const char *key){

   if (map_.erase(key) == 0)
     return MPI_ERR_INFO_NOKEY;
   else
   if (map_.erase(key) == 0)
     return MPI_ERR_INFO_NOKEY;
   else


@@ -70,7 +61,7 @@ int Info::get_nthkey(int n, char *key){
   return MPI_ERR_ARG;
 }
 
   return MPI_ERR_ARG;
 }
 

-int Info::get_valuelen(char *key, int *valuelen, int *flag){
+int Info::get_valuelen(const char *key, int *valuelen, int *flag){

   *flag=false;
   auto val = map_.find(key);
   if (val != map_.end()) {
   *flag=false;
   auto val = map_.find(key);
   if (val != map_.end()) {