-XBT_PUBLIC(msg_netzone_t) MSG_zone_get_root();
-XBT_PUBLIC(const char*) MSG_zone_get_name(msg_netzone_t zone);
-XBT_PUBLIC(msg_netzone_t) MSG_zone_get_by_name(const char* name);
-XBT_PUBLIC(void) MSG_zone_get_sons(msg_netzone_t zone, xbt_dict_t whereto);
-XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char* name);
-XBT_PUBLIC(void) MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value);
-XBT_PUBLIC(void) MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto);
-
-static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_root() instead: v3.19 will turn this warning into an error.")
- msg_netzone_t MSG_environment_get_routing_root()
-{
- return MSG_zone_get_root();
-}
-static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_name() instead: v3.19 will turn this warning into an error.")
- const char* MSG_environment_as_get_name(msg_netzone_t zone)
-{
- return MSG_zone_get_name(zone);
-}
-static inline XBT_ATTRIB_DEPRECATED_v319(
- "Use MSG_zone_get_by_name() instead: v3.19 will turn this warning into an error.") msg_netzone_t
- MSG_environment_as_get_by_name(const char* name)
-{
- return MSG_zone_get_by_name(name);
-}
-static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_sons() instead: v3.19 will turn this warning into an error.")
- xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t zone)
-{
- xbt_dict_t res = xbt_dict_new_homogeneous(NULL);
- MSG_zone_get_sons(zone, res);
- return res;
-}
-static inline XBT_ATTRIB_DEPRECATED_v319(
- "Use MSG_zone_get_property_value() instead: v3.19 will turn this warning into an error.") const
- char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name)
-{
- return MSG_zone_get_property_value(zone, name);
-}
-static inline XBT_ATTRIB_DEPRECATED_v319(
- "Use MSG_zone_set_property_value() instead: v3.19 will remove MSG_environment_as_set_property_value() "
- "completely.") void MSG_environment_as_set_property_value(msg_netzone_t zone, const char* name, char* value)
-{
- MSG_zone_set_property_value(zone, name, value);
-}
-static inline XBT_ATTRIB_DEPRECATED_v319(
- "Use MSG_zone_get_hosts() instead: v3.19 will remove MSG_environment_as_get_hosts() completely.") xbt_dynar_t
- MSG_environment_as_get_hosts(msg_netzone_t zone)
-{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL);
- MSG_zone_get_hosts(zone, res);
- return res;
-}
+XBT_PUBLIC sg_netzone_t sg_zone_get_root();
+#define MSG_zone_get_root() sg_zone_get_root()
+XBT_PUBLIC const char* sg_zone_get_name(sg_netzone_t zone);
+#define MSG_zone_get_name(zone) sg_zone_get_name(zone)
+XBT_PUBLIC sg_netzone_t sg_zone_get_by_name(const char* name);
+#define MSG_zone_get_by_name(name) sg_zone_get_by_name(name)
+XBT_PUBLIC void sg_zone_get_sons(sg_netzone_t zone, xbt_dict_t whereto);
+#define MSG_zone_get_sons(zone, whereto) sg_zone_get_sons(zone, whereto)
+XBT_PUBLIC const char* sg_zone_get_property_value(sg_netzone_t as, const char* name);
+#define MSG_zone_get_property_value(zone, name) sg_zone_get_property_value(zone, name)
+XBT_PUBLIC void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value);
+#define MSG_zone_set_property_value(zone, name, value) sg_zone_set_property_value(zone, name, value)
+XBT_PUBLIC void sg_zone_get_hosts(sg_netzone_t zone, xbt_dynar_t whereto);
+#define MSG_zone_get_hosts(zone, whereto) sg_zone_get_hosts(zone, whereto)