X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24155ae7d31167cd93d9bb4b48d92c8626a27676..f225e52fef082a934584fce772560fc730bfca48:/src/xbt/config.cpp

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index e51a1ba34f..b689db3738 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.     */
+/* Copyright (c) 2004-2020. 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. */
@@ -141,14 +141,7 @@ private:
   bool isdefault = true;
 
 public:
-  /* Callback */
-  xbt_cfg_cb_t old_callback = nullptr;
-
   ConfigurationElement(const std::string& key, const std::string& desc) : key(key), desc(desc) {}
-  ConfigurationElement(const std::string& key, const std::string& desc, xbt_cfg_cb_t cb)
-      : key(key), desc(desc), old_callback(cb)
-  {
-  }
 
   virtual ~ConfigurationElement() = default;
 
@@ -188,9 +181,6 @@ public:
   TypedConfigurationElement(const std::string& key, const std::string& desc, T value = T())
       : ConfigurationElement(key, desc), content(std::move(value))
   {}
-  TypedConfigurationElement(const std::string& key, const std::string& desc, T value, xbt_cfg_cb_t cb)
-      : ConfigurationElement(key, desc, cb), content(std::move(value))
-  {}
   TypedConfigurationElement(const std::string& key, const std::string& desc, T value, std::function<void(T&)> callback)
       : ConfigurationElement(key, desc), content(std::move(value)), callback(std::move(callback))
   {}
@@ -202,8 +192,6 @@ public:
 
   void update()
   {
-    if (old_callback)
-      this->old_callback(get_key().c_str());
     if (this->callback)
       this->callback(this->content);
   }
@@ -328,7 +316,7 @@ void Config::alias(const std::string& realname, const std::string& aliasname)
   this->aliases.insert({aliasname, element});
 }
 
-/** @brief Dump a config set for debuging purpose
+/** @brief Dump a config set for debugging purpose
  *
  * @param name The name to give to this config set
  * @param indent what to write at the beginning of each line (right number of spaces)
@@ -497,11 +485,6 @@ void help()
  * @param key the name of the variable
  * @param value the value of the variable
  */
-void xbt_cfg_set_int(const char *key, int value)
-{
-  sg_cfg_set_int(key, value);
-}
-
 void sg_cfg_set_int(const char* key, int value)
 {
   (*simgrid_config)[key].set_value<int>(value);
@@ -512,11 +495,6 @@ void sg_cfg_set_int(const char* key, int value)
  * @param key the name of the variable
  * @param value the double to set
  */
-void xbt_cfg_set_double(const char *key, double value)
-{
-  sg_cfg_set_double(key, value);
-}
-
 void sg_cfg_set_double(const char* key, double value)
 {
   (*simgrid_config)[key].set_value<double>(value);
@@ -528,11 +506,6 @@ void sg_cfg_set_double(const char* key, double value)
  * @param value the value to be added
  *
  */
-void xbt_cfg_set_string(const char* key, const char* value)
-{
-  sg_cfg_set_string(key, value);
-}
-
 void sg_cfg_set_string(const char* key, const char* value)
 {
   (*simgrid_config)[key].set_value<std::string>(value);
@@ -543,11 +516,6 @@ void sg_cfg_set_string(const char* key, const char* value)
  * @param key the name of the variable
  * @param value the value of the variable
  */
-void xbt_cfg_set_boolean(const char *key, const char *value)
-{
-  sg_cfg_set_boolean(key, value);
-}
-
 void sg_cfg_set_boolean(const char* key, const char* value)
 {
   (*simgrid_config)[key].set_value<bool>(simgrid::config::parse_bool(value));
@@ -560,11 +528,6 @@ void sg_cfg_set_boolean(const char* key, const char* value)
  *
  * Returns the first value from the config set under the given name.
  */
-int xbt_cfg_get_int(const char *key)
-{
-  return sg_cfg_get_int(key);
-}
-
 int sg_cfg_get_int(const char* key)
 {
   return (*simgrid_config)[key].get_value<int>();
@@ -576,11 +539,6 @@ int sg_cfg_get_int(const char* key)
  *
  * Returns the first value from the config set under the given name.
  */
-double xbt_cfg_get_double(const char *key)
-{
-  return sg_cfg_get_double(key);
-}
-
 double sg_cfg_get_double(const char* key)
 {
   return (*simgrid_config)[key].get_value<double>();
@@ -593,11 +551,6 @@ double sg_cfg_get_double(const char* key)
  * Returns the first value from the config set under the given name.
  * If there is more than one value, it will issue a warning.
  */
-int xbt_cfg_get_boolean(const char *key)
-{
-  return sg_cfg_get_boolean(key);
-}
-
 int sg_cfg_get_boolean(const char* key)
 {
   return (*simgrid_config)[key].get_value<bool>() ? 1 : 0;