From 4aa891bcff8d28d5dda4ed6ec9a4ac08dfdbfacd Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 9 Jan 2018 13:25:34 +0100 Subject: [PATCH] Kill features marked deprecated until v3.19. --- include/simgrid/msg.h | 54 +---------------------- include/simgrid/s4u/ConditionVariable.hpp | 7 +-- include/xbt/base.h | 1 - include/xbt/dict.h | 4 +- src/xbt/dict.cpp | 11 +---- 5 files changed, 4 insertions(+), 73 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index aefc89e320..7da4c7f431 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -168,53 +168,6 @@ XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char 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); -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_root() instead: v3.19 will turn this warning into an error.") static inline msg_netzone_t - MSG_environment_get_routing_root() -{ - return MSG_zone_get_root(); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_name() instead: v3.19 will turn this warning into an error.") static inline const - char* MSG_environment_as_get_name(msg_netzone_t zone) -{ - return MSG_zone_get_name(zone); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_by_name() instead: v3.19 will turn this warning into an error.") static inline msg_netzone_t - MSG_environment_as_get_by_name(const char* name) -{ - return MSG_zone_get_by_name(name); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_sons() instead: v3.19 will turn this warning into an error.") static inline 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; -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_property_value() instead: v3.19 will turn this warning into an error.") static inline const - char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) -{ - return MSG_zone_get_property_value(zone, name); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_set_property_value() instead: v3.19 will remove MSG_environment_as_set_property_value() " - "completely.") static inline void MSG_environment_as_set_property_value(msg_netzone_t zone, const char* name, - char* value) -{ - MSG_zone_set_property_value(zone, name, value); -} -XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_hosts() instead: v3.19 will remove MSG_environment_as_get_hosts() " - "completely.") static inline 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; -} - /************************** Storage handling ***********************************/ XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage); XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name); @@ -246,11 +199,6 @@ XBT_PUBLIC(void) MSG_host_get_process_list(msg_host_t h, xbt_dynar_t whereto); XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); XBT_PUBLIC(int) MSG_host_is_off(msg_host_t h); -XBT_ATTRIB_DEPRECATED_v319("Use MSG_host_get_speed(): v3.19 will drop MSG_get_host_speed() " - "completely.") static inline double MSG_get_host_speed(msg_host_t host) -{ - return MSG_host_get_speed(host); -} XBT_ATTRIB_DEPRECATED_v320("Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() " "completely.") static inline double MSG_host_get_current_power_peak(msg_host_t host) { diff --git a/include/simgrid/s4u/ConditionVariable.hpp b/include/simgrid/s4u/ConditionVariable.hpp index 25d1dcfb22..85f4c47d94 100644 --- a/include/simgrid/s4u/ConditionVariable.hpp +++ b/include/simgrid/s4u/ConditionVariable.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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. */ @@ -103,11 +103,6 @@ public: void notify_one(); void notify_all(); - - XBT_ATTRIB_DEPRECATED_v319("Use notify_one(): v3.19 will change this warning into an error.") void notify() - { - notify_one(); - } }; using ConditionVariablePtr = ConditionVariable::Ptr; diff --git a/include/xbt/base.h b/include/xbt/base.h index c33f60a565..e803e933e0 100644 --- a/include/xbt/base.h +++ b/include/xbt/base.h @@ -71,7 +71,6 @@ #define XBT_ATTRIB_DEPRECATED(msg) __attribute__((deprecated(msg))) #endif -#define XBT_ATTRIB_DEPRECATED_v319(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.19 */ #define XBT_ATTRIB_DEPRECATED_v320(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.20 */ #define XBT_ATTRIB_DEPRECATED_v321(msg) XBT_ATTRIB_DEPRECATED(msg) /* Will be dropped in v3.21 */ diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 9da94d62af..4981e6a337 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -1,6 +1,6 @@ /* xbt/dict.h -- api to a generic dictionary */ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -55,8 +55,6 @@ typedef struct s_xbt_dictelm { xbt_dictelm_t next; } s_xbt_dictelm_t; -XBT_ATTRIB_DEPRECATED_v319("Use xbt_dict_new_homogeneous(). v3.19 will turn this warning into an error.") - XBT_PUBLIC(xbt_dict_t) xbt_dict_new(); XBT_PUBLIC(xbt_dict_t) xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn); XBT_PUBLIC(void) xbt_dict_free(xbt_dict_t * dict); XBT_PUBLIC(unsigned int) xbt_dict_size(xbt_dict_t dict); diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp index 2d2520d758..d582cbf616 100644 --- a/src/xbt/dict.cpp +++ b/src/xbt/dict.cpp @@ -1,6 +1,6 @@ /* dict - a generic dictionary, variation over hash table */ -/* Copyright (c) 2004-2017. The SimGrid Team. +/* Copyright (c) 2004-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -20,15 +20,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables"); -xbt_dict_t xbt_dict_new() -{ - XBT_WARN("Function xbt_dict_new() will soon be dropped. Please switch to xbt_dict_new_homogeneous()"); - xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr); - dict->homogeneous = 0; - - return dict; -} - /** * \brief Constructor * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary -- 2.20.1