Deprecate xbt_cfg_register_<type>().

diff --git a/include/xbt/config.h b/include/xbt/config.h
index 120b258..0627391 100644 (file)
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -112,12 +112,14 @@ XBT_PUBLIC void xbt_cfg_dump(const char* name, const char* indent, xbt_cfg_t cfg
  *
  *  @{
  */
  *
  *  @{
  */

-XBT_PUBLIC void xbt_cfg_register_double(const char* name, double default_val, xbt_cfg_cb_t cb_set, const char* desc);
-XBT_PUBLIC void xbt_cfg_register_int(const char* name, int default_val, xbt_cfg_cb_t cb_set, const char* desc);
-XBT_PUBLIC void xbt_cfg_register_string(const char* name, const char* default_val, xbt_cfg_cb_t cb_set,
-                                        const char* desc);
-XBT_PUBLIC void xbt_cfg_register_boolean(const char* name, const char* default_val, xbt_cfg_cb_t cb_set,
-                                         const char* desc);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::declareFlag<>") XBT_PUBLIC
+    void xbt_cfg_register_double(const char* name, double default_val, xbt_cfg_cb_t cb_set, const char* desc);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::declareFlag<>") XBT_PUBLIC
+    void xbt_cfg_register_int(const char* name, int default_val, xbt_cfg_cb_t cb_set, const char* desc);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::declareFlag<>") XBT_PUBLIC
+    void xbt_cfg_register_string(const char* name, const char* default_val, xbt_cfg_cb_t cb_set, const char* desc);
+XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::declareFlag<>") XBT_PUBLIC
+    void xbt_cfg_register_boolean(const char* name, const char* default_val, xbt_cfg_cb_t cb_set, const char* desc);

 XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::alias") XBT_PUBLIC
     void xbt_cfg_register_alias(const char* newname, const char* oldname);
 
 XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::alias") XBT_PUBLIC
     void xbt_cfg_register_alias(const char* newname, const char* oldname);
 

diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index deb5fc3..425a9fb 100644 (file)
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -688,9 +688,9 @@ static void make_set()
 {
   simgrid_config = nullptr;
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);
 {
   simgrid_config = nullptr;
   xbt_log_threshold_set(&_XBT_LOGV(xbt_cfg), xbt_log_priority_critical);

-  xbt_cfg_register_int("speed", 0, nullptr, "");
-  xbt_cfg_register_string("peername", "", nullptr, "");
-  xbt_cfg_register_string("user", "", nullptr, "");
+  simgrid::config::declareFlag<int>("speed", "description", 0);
+  simgrid::config::declareFlag<std::string>("peername", "description", "");
+  simgrid::config::declareFlag<std::string>("user", "description", "");

 }                               /* end_of_make_set */
 
 XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")
 }                               /* end_of_make_set */
 
 XBT_TEST_UNIT("memuse", test_config_memuse, "Alloc and free a config set")