From: Martin Quinson Date: Wed, 9 Oct 2019 15:45:07 +0000 (+0200) Subject: un-deprecate a redundent function X-Git-Tag: v3.24~4 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a2e3017a310c1a90c034738dfbe3d220565281ea un-deprecate a redundent function I don't see why we should not help our users. Having 2 functions doing close (but different) things is not such a bad thing. --- diff --git a/include/simgrid/plugins/energy.h b/include/simgrid/plugins/energy.h index 035103c9ca..3bf34298c3 100644 --- a/include/simgrid/plugins/energy.h +++ b/include/simgrid/plugins/energy.h @@ -14,8 +14,7 @@ SG_BEGIN_DECL() XBT_PUBLIC void sg_host_energy_plugin_init(); XBT_PUBLIC void sg_host_energy_update_all(); XBT_PUBLIC double sg_host_get_consumed_energy(sg_host_t host); -XBT_ATTRIB_DEPRECATED_v327("Please use !sg_host_get_idle_consumption_at()") \ - XBT_PUBLIC double sg_host_get_idle_consumption(sg_host_t host); /* deprecated */ +XBT_PUBLIC double sg_host_get_idle_consumption(sg_host_t host); XBT_PUBLIC double sg_host_get_idle_consumption_at(sg_host_t host, int pstate); XBT_PUBLIC double sg_host_get_wattmin_at(sg_host_t host, int pstate); XBT_PUBLIC double sg_host_get_wattmax_at(sg_host_t host, int pstate); diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 400fb8570a..de496199f1 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -596,7 +596,6 @@ double sg_host_get_consumed_energy(sg_host_t host) /** @ingroup plugin_host_energy * @brief Get the amount of watt dissipated when the host is idling - * This function is deprecated and will not work after v3.27. Use sg_host_get_idle_consumption_at instead. */ double sg_host_get_idle_consumption(sg_host_t host) {