From 771173935e00663e8f6ae0a903e5b38f3d8abf6e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 18 Jan 2016 21:13:20 +0100 Subject: [PATCH] fix my borken english --- include/simgrid/link.h | 2 +- include/simgrid/simdag.h | 2 +- src/surf/network_interface.cpp | 6 +++--- src/surf/network_interface.hpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/simgrid/link.h b/include/simgrid/link.h index 322d8b1f0f..39b6f316e2 100644 --- a/include/simgrid/link.h +++ b/include/simgrid/link.h @@ -20,7 +20,7 @@ XBT_PUBLIC(double) sg_link_bandwidth(Link *link); XBT_PUBLIC(double) sg_link_latency(Link *link); XBT_PUBLIC(void*) sg_link_data(Link *link); XBT_PUBLIC(void) sg_link_data_set(Link *link,void *data); -XBT_PUBLIC(int) sg_link_amount(void); +XBT_PUBLIC(int) sg_link_count(void); XBT_PUBLIC(Link**) sg_link_list(void); XBT_PUBLIC(void) sg_link_exit(void); SG_END_DECL() diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 5226d58e54..c6cab06997 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -114,7 +114,7 @@ typedef xbt_dictelm_t SD_storage_t; XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void); /** @brief Returns the number of links in the whole platform */ static inline int SD_link_get_number(void) { - return sg_link_amount(); + return sg_link_count(); } /** @brief Returns the user data of a link */ diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index bae76b82e4..4376384ba6 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -43,8 +43,8 @@ void* sg_link_data(Link *link) { void sg_link_data_set(Link *link,void *data) { link->setData(data); } -int sg_link_amount(void) { - return Link::linksAmount(); +int sg_link_count(void) { + return Link::linksCount(); } Link** sg_link_list(void) { return Link::linksList(); @@ -72,7 +72,7 @@ Link *Link::byName(const char* name) { return res; } /** @brief Returns the amount of links in the platform */ -int Link::linksAmount() { +int Link::linksCount() { return links->size(); } /** @brief Returns a list of all existing links */ diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index b116ed6b5b..b18b487d66 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -258,7 +258,7 @@ private: static boost::unordered_map *links; public: static Link *byName(const char* name); - static int linksAmount(); + static int linksCount(); static Link **linksList(); static void linksExit(); }; -- 2.20.1