From: Martin Quinson Date: Sat, 10 Jul 2021 09:06:39 +0000 (+0200) Subject: Hide some deprecated symbols from doxygen X-Git-Tag: v3.28~9 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6601313772c89bdfcf4e73a9432e25f1611acd66 Hide some deprecated symbols from doxygen --- diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index 0fee089808..0ea9de8741 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -81,6 +81,7 @@ public: /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */ static ssize_t test_any(const std::vector& comms); +#ifndef DOXYGEN XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static int wait_any(const std::vector* comms) { return static_cast(wait_any_for(*comms, -1)); } XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for first parameter") @@ -89,6 +90,7 @@ public: static void wait_all(const std::vector* comms) { wait_all(*comms); } XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static int test_any(const std::vector* comms) { return static_cast(test_any(*comms)); } +#endif Comm* start() override; Comm* wait_for(double timeout) override; diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index 870f85a1fa..d814cf21db 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -42,7 +42,6 @@ public: /** @brief Retrieves the name of that netzone as a C string */ const char* get_cname() const; - XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father() const; NetZone* get_parent() const; NetZone* set_parent(const NetZone* parent); @@ -59,9 +58,12 @@ public: /** @brief Get the netpoint associated to this netzone */ kernel::routing::NetPoint* get_netpoint(); +#ifndef DOXYGEN + XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZone* get_father() const; std::vector get_children() const; XBT_ATTRIB_DEPRECATED_v332("Please use set_parent() to manage NetZone's relationship") NetZone* add_child( NetZone* new_zone); +#endif void extract_xbt_graph(const s_xbt_graph_t* graph, std::map>* nodes, std::map>* edges); diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp index ecfeb1ee08..76e83805ae 100644 --- a/include/simgrid/s4u/VirtualMachine.hpp +++ b/include/simgrid/s4u/VirtualMachine.hpp @@ -42,7 +42,9 @@ public: SUSPENDED, /**< Suspend/resume does not involve disk I/O, so we assume there is no transition states. */ DESTROYED ); +#ifndef DOXYGEN using state XBT_ATTRIB_DEPRECATED_v332("Please use VirtualMachine::State") = State; +#endif vm::VirtualMachineImpl* get_vm_impl() const { return pimpl_vm_; } void start();