From 09392faf42646e631a4e42553e901410eb3e488e Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 21 Nov 2023 11:40:41 +0100 Subject: [PATCH] Update XBT_ATTRIB_DEPRECATED_v??? in comments. [ci-skip] --- include/simgrid/s4u/Comm.hpp | 3 ++- include/simgrid/s4u/Io.hpp | 2 +- src/bindings/python/simgrid_python.cpp | 2 +- src/s4u/s4u_Activity.cpp | 2 +- src/s4u/s4u_Comm.cpp | 6 +++--- src/s4u/s4u_Io.cpp | 2 +- src/s4u/s4u_Netzone.cpp | 4 ++-- src/s4u/s4u_VirtualMachine.cpp | 3 ++- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index cf4cf5a8b3..57f6443c29 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -188,7 +188,8 @@ public: XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") static ssize_t wait_any(const std::vector& comms) { return deprecated_wait_any_for(comms, -1); } XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") static ssize_t wait_any_for(const std::vector& comms, double timeout) { return deprecated_wait_any_for(comms, timeout); } - static ssize_t deprecated_wait_any_for(const std::vector& comms, double timeout); + static ssize_t deprecated_wait_any_for(const std::vector& comms, + double timeout); // XBT_ATTRIB_DEPRECATED_v339 XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") static ssize_t test_any(const std::vector& comms); XBT_ATTRIB_DEPRECATED_v339("Please use ActivitySet instead") static void wait_all(const std::vector& comms); diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp index 6dc9a3f051..0709a3b50c 100644 --- a/include/simgrid/s4u/Io.hpp +++ b/include/simgrid/s4u/Io.hpp @@ -28,7 +28,7 @@ protected: explicit Io(kernel::activity::IoImplPtr pimpl); Io* do_start() override; - static ssize_t deprecated_wait_any_for(const std::vector& ios, double timeout); + static ssize_t deprecated_wait_any_for(const std::vector& ios, double timeout); // XBT_ATTRIB_DEPRECATED_v339 public: enum class OpType { READ, WRITE }; diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 7f5f6b9ed0..6d6f5c15ba 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -240,7 +240,7 @@ PYBIND11_MODULE(simgrid, m) simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src, simgrid::kernel::routing::NetPoint* gw_dst, const std::vector& links, bool symmetrical) { - PyErr_WarnEx(PyExc_DeprecationWarning, // XBT_ATTRIB_DEPRECATED_v335. Once removed, uncomment the + PyErr_WarnEx(PyExc_DeprecationWarning, // XBT_ATTRIB_DEPRECATED_v336. Once removed, uncomment the // deprecation of the AddRoute function in C++ "Please call add_route either from Host to Host or NetZone to NetZone. This call will be " "removed after SimGrid v3.35.", diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp index 091b2a12cb..a1711b5fb5 100644 --- a/src/s4u/s4u_Activity.cpp +++ b/src/s4u/s4u_Activity.cpp @@ -92,7 +92,7 @@ bool Activity::test() return false; } -ssize_t Activity::test_any(const std::vector& activities) +ssize_t Activity::test_any(const std::vector& activities) // XBT_ATTRIB_DEPRECATED_v339 { std::vector ractivities(activities.size()); std::transform(begin(activities), end(activities), begin(ractivities), diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 5d27168a0f..aec421bfa9 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -563,7 +563,7 @@ sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout) return status; } -void sg_comm_wait_all(sg_comm_t* comms, size_t count) +void sg_comm_wait_all(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { simgrid::s4u::ActivitySet as; for (size_t i = 0; i < count; i++) @@ -572,7 +572,7 @@ void sg_comm_wait_all(sg_comm_t* comms, size_t count) as.wait_all(); } -ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) +ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { std::vector s4u_comms; for (size_t i = 0; i < count; i++) @@ -586,7 +586,7 @@ ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) return pos; } -ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) +ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { std::vector s4u_comms; for (size_t i = 0; i < count; i++) diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp index e8aa898590..c20e891862 100644 --- a/src/s4u/s4u_Io.cpp +++ b/src/s4u/s4u_Io.cpp @@ -95,7 +95,7 @@ Io* Io::do_start() return this; } -ssize_t Io::deprecated_wait_any_for(const std::vector& ios, double timeout) +ssize_t Io::deprecated_wait_any_for(const std::vector& ios, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { ActivitySet set; for (const auto& io : ios) diff --git a/src/s4u/s4u_Netzone.cpp b/src/s4u/s4u_Netzone.cpp index 1917f0f658..b62e620f10 100644 --- a/src/s4u/s4u_Netzone.cpp +++ b/src/s4u/s4u_Netzone.cpp @@ -110,14 +110,14 @@ void NetZone::add_route(const NetZone* src, const NetZone* dst, const std::vecto void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical) //XBT_ATTRIB_DEPRECATED_v339 + const std::vector& link_list, bool symmetrical) // XBT_ATTRIB_DEPRECATED_v339 { pimpl_->add_route(src, dst, gw_src, gw_dst, link_list, symmetrical); } void NetZone::add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, - const std::vector& links) //XBT_ATTRIB_DEPRECATED_v339 + const std::vector& links) // XBT_ATTRIB_DEPRECATED_v339 { std::vector links_direct; std::vector links_reverse; diff --git a/src/s4u/s4u_VirtualMachine.cpp b/src/s4u/s4u_VirtualMachine.cpp index 9f6f7716ee..71a8f7a026 100644 --- a/src/s4u/s4u_VirtualMachine.cpp +++ b/src/s4u/s4u_VirtualMachine.cpp @@ -32,7 +32,8 @@ void VmHostExt::ensureVmExtInstalled() EXTENSION_ID = Host::extension_create(); } -VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host, int core_amount, size_t ramsize) +VirtualMachine::VirtualMachine(const std::string& name, s4u::Host* physical_host, int core_amount, + size_t ramsize) // XBT_ATTRIB_DEPRECATED_v336 : Host(new kernel::resource::VirtualMachineImpl(name, this, physical_host, core_amount, ramsize)) , pimpl_vm_(dynamic_cast(Host::get_impl())) { -- 2.20.1