From 9dd6c8d9068ab1ee9472e8fe17f9e602179a3073 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 23 Oct 2020 16:00:43 +0200 Subject: [PATCH] Follow coding style for sg_link_{get,set}_data. --- docs/source/app_s4u.rst | 4 ++-- include/simgrid/link.h | 7 +++++-- src/s4u/s4u_Link.cpp | 12 ++++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/docs/source/app_s4u.rst b/docs/source/app_s4u.rst index 7a3b966b9f..459d26f7a2 100644 --- a/docs/source/app_s4u.rst +++ b/docs/source/app_s4u.rst @@ -1387,8 +1387,8 @@ User data and properties .. group-tab:: C - .. autodoxymethod:: sg_link_data(const_sg_link_t link) - .. autodoxymethod:: sg_link_data_set(sg_link_t link, void *data) + .. autodoxymethod:: sg_link_get_data(const_sg_link_t link) + .. autodoxymethod:: sg_link_set_data(sg_link_t link, void *data) On/Off ------ diff --git a/include/simgrid/link.h b/include/simgrid/link.h index 115e64aea5..95674653d1 100644 --- a/include/simgrid/link.h +++ b/include/simgrid/link.h @@ -20,8 +20,11 @@ XBT_PUBLIC double sg_link_bandwidth(const_sg_link_t link); XBT_PUBLIC void sg_link_bandwidth_set(sg_link_t link, double value); XBT_PUBLIC double sg_link_latency(const_sg_link_t link); XBT_PUBLIC void sg_link_latency_set(sg_link_t link, double value); -XBT_PUBLIC void* sg_link_data(const_sg_link_t link); -XBT_PUBLIC void sg_link_data_set(sg_link_t link, void* data); +XBT_PUBLIC void* sg_link_get_data(const_sg_link_t link); +XBT_PUBLIC void sg_link_set_data(sg_link_t link, void* data); +XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_get_data()") XBT_PUBLIC void* sg_link_data(const_sg_link_t link); +XBT_ATTRIB_DEPRECATED_v330("Please use sg_link_set_data()") XBT_PUBLIC + void sg_link_data_set(sg_link_t link, void* data); XBT_PUBLIC int sg_link_count(); XBT_PUBLIC sg_link_t* sg_link_list(); SG_END_DECL diff --git a/src/s4u/s4u_Link.cpp b/src/s4u/s4u_Link.cpp index dd77817a48..a6fc9029b1 100644 --- a/src/s4u/s4u_Link.cpp +++ b/src/s4u/s4u_Link.cpp @@ -161,14 +161,22 @@ void sg_link_latency_set(sg_link_t link, double value) { return link->set_latency(value); } -void* sg_link_data(const_sg_link_t link) +void* sg_link_get_data(const_sg_link_t link) { return link->get_data(); } -void sg_link_data_set(sg_link_t link, void* data) +void sg_link_set_data(sg_link_t link, void* data) { link->set_data(data); } +void* sg_link_data(const_sg_link_t link) // XBT_ATTRIB_DEPRECATED_v330 +{ + return sg_link_get_data(link); +} +void sg_link_data_set(sg_link_t link, void* data) // XBT_ATTRIB_DEPRECATED_v330 +{ + sg_link_set_data(link, data); +} int sg_link_count() { return simgrid::s4u::Engine::get_instance()->get_link_count(); -- 2.30.2