From e76b3663393a47c8a97cff1cac268db2b4850a51 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 19 Apr 2018 14:44:11 +0200
Subject: [PATCH] Convert xbt_cfg_set_as_string ->
 simgrid::config::set_as_string

---
 include/xbt/config.h     | 3 ++-
 include/xbt/config.hpp   | 2 ++
 src/msg/msg_global.cpp   | 2 +-
 src/simdag/sd_global.cpp | 2 +-
 src/xbt/config.cpp       | 5 +++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/xbt/config.h b/include/xbt/config.h
index 7cd6b613e9..a709bb1da6 100644
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -78,7 +78,8 @@ XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::set_value<bool>") XBT_PU
     void xbt_cfg_set_boolean(const char* name, const char* val);
 XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::set_value<std::string>") XBT_PUBLIC
     void xbt_cfg_set_string(const char* name, const char* val);
-XBT_PUBLIC void xbt_cfg_set_as_string(const char* name, const char* val);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::set_as_string") XBT_PUBLIC
+    void xbt_cfg_set_as_string(const char* name, const char* val);
 
 /*
   Set the default value of the cell \a name in \a cfg with the provided value.
diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index c9fe8653ab..eb160168b8 100644
--- a/include/xbt/config.hpp
+++ b/include/xbt/config.hpp
@@ -63,6 +63,8 @@ extern template XBT_PUBLIC void set_value<double>(const char* name, double value
 extern template XBT_PUBLIC void set_value<bool>(const char* name, bool value);
 extern template XBT_PUBLIC void set_value<std::string>(const char* name, std::string value);
 
+XBT_PUBLIC void set_as_string(const char* name, const std::string& value);
+
 // Get config
 
 template <class T> XBT_PUBLIC T const& get_value(const char* name);
diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 3fc450f83a..b3a49bdf3a 100644
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -82,7 +82,7 @@ msg_error_t MSG_main()
  */
 void MSG_config(const char *key, const char *value){
   xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()");
-  xbt_cfg_set_as_string(key, value);
+  simgrid::config::set_as_string(key, value);
 }
 
 /** \ingroup msg_simulation
diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index cf67f8cc1f..81ed28ad34 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -178,7 +178,7 @@ void SD_init_nocheck(int *argc, char **argv)
  */
 void SD_config(const char *key, const char *value){
   xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()");
-  xbt_cfg_set_as_string(key, value);
+  simgrid::config::set_as_string(key, value);
 }
 
 /**
diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index 62d44ecd9d..3f05c02a79 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -395,6 +395,11 @@ template XBT_PUBLIC void set_value<double>(const char* name, double value);
 template XBT_PUBLIC void set_value<bool>(const char* name, bool value);
 template XBT_PUBLIC void set_value<std::string>(const char* name, std::string value);
 
+void set_as_string(const char* name, const std::string& value)
+{
+  (*simgrid_config)[name].set_string_value(value.c_str());
+}
+
 // ***** get_value *****
 
 template <class T> XBT_PUBLIC T const& get_value(const char* name)
-- 
2.20.1