Remove deprecated features for next release (3.36).

diff --git a/docs/source/Doxyfile b/docs/source/Doxyfile
index 30041d4..80b57e9 100644 (file)
--- a/docs/source/Doxyfile
+++ b/docs/source/Doxyfile
@@ -68,6 +68,5 @@ PREDEFINED             += \
     XBT_ATTRIB_NORETURN= \
     XBT_ATTRIB_UNUSED= \
     XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cname,parent,desc)= \
-    XBT_ATTRIB_DEPRECATED_v336(mesg)= \
     XBT_ATTRIB_DEPRECATED_v338(mesg)= \
     XBT_ATTRIB_DEPRECATED_v339(mesg)=

diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp
index ab535fa..6805270 100644 (file)
--- a/include/simgrid/s4u/NetZone.hpp
+++ b/include/simgrid/s4u/NetZone.hpp
@@ -104,10 +104,9 @@ public:
    * @param link_list List of links and their direction used in this communication
    * @param symmetrical Bi-directional communication
    */
-  //(we should first remove the Python binding in v3.35) XBT_ATTRIB_DEPRECATED_v339("Please call add_route either from
-  // Host to Host or NetZone to NetZone")
-  void add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
-                 kernel::routing::NetPoint* gw_dst, const std::vector<LinkInRoute>& link_list, bool symmetrical = true);
+  XBT_ATTRIB_DEPRECATED_v339("Please call add_route either from Host to Host or NetZone to NetZone") void add_route(
+      kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, kernel::routing::NetPoint* gw_src,
+      kernel::routing::NetPoint* gw_dst, const std::vector<LinkInRoute>& link_list, bool symmetrical = true);
   /**
    * @brief Add a route between 2 netpoints, and same in other direction
    *

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 6733ba3..b269022 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -59,11 +59,6 @@ class XBT_PUBLIC VirtualMachine : public s4u::Host {
 #endif
 
 public:
-  XBT_ATTRIB_DEPRECATED_v336("Please use s4u::Host::create_vm") explicit VirtualMachine(const std::string& name,
-                                                                                        Host* physical_host,
-                                                                                        int core_amount,
-                                                                                        size_t ramsize = 1024);
-
 #ifndef DOXYGEN
   // No copy/move
   VirtualMachine(VirtualMachine const&) = delete;

diff --git a/include/xbt/base.h b/include/xbt/base.h
index a4c062d..080c784 100644 (file)
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -42,8 +42,6 @@
 #define XBT_ATTRIB_DEPRECATED(mesg) __attribute__((deprecated(mesg)))
 #endif
 
-#define XBT_ATTRIB_DEPRECATED_v336(mesg)                                                                               \
-  XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.35)")
 #define XBT_ATTRIB_DEPRECATED_v338(mesg)                                                                               \
   XBT_ATTRIB_DEPRECATED(mesg " (this compatibility wrapper will be dropped after v3.37)")
 #define XBT_ATTRIB_DEPRECATED_v339(mesg)                                                                               \

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index c06da84..d004949 100644 (file)
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -235,18 +235,6 @@ PYBIND11_MODULE(simgrid, m)
       .def_static("create_vivaldi_zone", &simgrid::s4u::create_vivaldi_zone, "Creates a zone of type Vivaldi")
       .def_static("create_empty_zone", &simgrid::s4u::create_empty_zone, "Creates a zone of type Empty")
       .def_static("create_wifi_zone", &simgrid::s4u::create_wifi_zone, "Creates a zone of type Wi-Fi")
-      .def("add_route",
-           [](simgrid::s4u::NetZone* self, simgrid::kernel::routing::NetPoint* src,
-              simgrid::kernel::routing::NetPoint* dst, simgrid::kernel::routing::NetPoint* gw_src,
-              simgrid::kernel::routing::NetPoint* gw_dst, const std::vector<simgrid::s4u::LinkInRoute>& links,
-              bool symmetrical) {
-             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.",
-                          1);
-             self->add_route(src, dst, gw_src, gw_dst, links, symmetrical);
-           })
       .def("add_route",
            py::overload_cast<const simgrid::s4u::Host*, const simgrid::s4u::Host*,
                              const std::vector<simgrid::s4u::LinkInRoute>&, bool>(&simgrid::s4u::NetZone::add_route),

diff --git a/src/s4u/s4u_VirtualMachine.cpp b/src/s4u/s4u_VirtualMachine.cpp
index 71a8f7a..415b1f7 100644 (file)
--- a/src/s4u/s4u_VirtualMachine.cpp
+++ b/src/s4u/s4u_VirtualMachine.cpp
@@ -32,14 +32,6 @@ void VmHostExt::ensureVmExtInstalled()
     EXTENSION_ID = Host::extension_create<VmHostExt>();
 }
 
-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<kernel::resource::VirtualMachineImpl*>(Host::get_impl()))
-{
-  physical_host->get_impl()->create_vm(name, this);
-}
-
 VirtualMachine::VirtualMachine(kernel::resource::VirtualMachineImpl* impl)
     : Host(impl), pimpl_vm_(dynamic_cast<kernel::resource::VirtualMachineImpl*>(Host::get_impl()))
 {