[config] Create a Config class

[simgrid.git] / include / xbt / config.h

diff --git a/include/xbt/config.h b/include/xbt/config.h
index 40610142952cd6390d61e6a7ed441a21189f5314..f0b8a405692c9eafbbb8359ad9a381ccad6945ba 100644 (file)
--- a/include/xbt/config.h
+++ b/include/xbt/config.h
@@ -78,7 +78,16 @@ SG_BEGIN_DECL()
  * @{
  */
 /** @brief Configuration set's data type is opaque. */
+#ifdef __cplusplus
+namespace simgrid {
+namespace config {
+class Config;
+}
+}
+typedef simgrid::config::Config* xbt_cfg_t;
+#else
 typedef void* xbt_cfg_t;
+#endif
 
 XBT_PUBLIC(void) xbt_cfg_set(xbt_cfg_t cfg, const char *name, ...);
 XBT_PUBLIC(void) xbt_cfg_set_vargs(xbt_cfg_t cfg, const char *name, va_list pa);
@@ -132,8 +141,6 @@ struct xbt_boolean_couple {
 
 /** \brief Callback types. They get the name of the modified entry, and the position of the changed value */
 typedef void (*xbt_cfg_cb_t) (const char * name);
-typedef void (*xbt_cfg_cb_ext_t)(const char * name, void* cb_data);
-typedef void (*xbt_cfg_cb_free_t)(void* cb_data);
 
 XBT_PUBLIC(xbt_cfg_t) xbt_cfg_new(void);
 XBT_PUBLIC(void) xbt_cfg_free(xbt_cfg_t * cfg);
@@ -155,10 +162,6 @@ XBT_PUBLIC(void) xbt_cfg_register_boolean(const char *name, const char*default_v
 XBT_PUBLIC(void) xbt_cfg_register_alias(const char *newname, const char *oldname);
 XBT_PUBLIC(void) xbt_cfg_register_str(xbt_cfg_t * cfg, const char *entry);
 
-XBT_PUBLIC(void) xbt_cfg_register_ext(
-  const char *name, const char *desc, e_xbt_cfgelm_type_t type,
-  xbt_cfg_cb_ext_t cb, void* data, xbt_cfg_cb_free_t data_free);
-
 XBT_PUBLIC(void) xbt_cfg_aliases(void);
 XBT_PUBLIC(void) xbt_cfg_help(void);
 XBT_PUBLIC(e_xbt_cfgelm_type_t) xbt_cfg_get_type(xbt_cfg_t cfg, const char *name);