No need to keep functions that did not even exist in v3.25.

diff --git a/include/simgrid/disk.h b/include/simgrid/disk.h
index 65b6b52..ef71b3f 100644 (file)
--- a/include/simgrid/disk.h
+++ b/include/simgrid/disk.h
@@ -12,7 +12,6 @@
 /* C interface */
 SG_BEGIN_DECL
 XBT_PUBLIC const char* sg_disk_get_name(const_sg_disk_t disk);
-XBT_ATTRIB_DEPRECATED_v330("Please use sg_disk_get_name()") XBT_PUBLIC const char* sg_disk_name(const_sg_disk_t disk);
 XBT_PUBLIC sg_host_t sg_disk_get_host(const_sg_disk_t disk);
 XBT_PUBLIC double sg_disk_read_bandwidth(const_sg_disk_t disk);
 XBT_PUBLIC double sg_disk_write_bandwidth(const_sg_disk_t disk);
@@ -20,9 +19,6 @@ XBT_PUBLIC sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size);
 XBT_PUBLIC sg_size_t sg_disk_read(sg_disk_t disk, sg_size_t size);
 XBT_PUBLIC void* sg_disk_get_data(const_sg_disk_t disk);
 XBT_PUBLIC void sg_disk_set_data(sg_disk_t disk, void* data);
-XBT_ATTRIB_DEPRECATED_v330("Please use sg_disk_get_data() instead") XBT_PUBLIC void* sg_disk_data(const_sg_disk_t disk);
-XBT_ATTRIB_DEPRECATED_v330("Please use sg_disk_set_data() instead") XBT_PUBLIC
-    void sg_disk_data_set(sg_disk_t disk, void* data);
 SG_END_DECL
 
 #endif /* INCLUDE_SIMGRID_DISK_H_ */

diff --git a/include/simgrid/host.h b/include/simgrid/host.h
index 46dba84..ba0e8bc 100644 (file)
--- a/include/simgrid/host.h
+++ b/include/simgrid/host.h
@@ -72,8 +72,6 @@ XBT_PUBLIC xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host);
  */
 XBT_PUBLIC xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host);
 XBT_PUBLIC void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks);
-XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_disks()") XBT_PUBLIC
-    void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks);
 
 // =========== user-level functions ===============
 /** @brief Return the speed of the processor (in flop/s), regardless of the current load on the machine. */

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index f79b6d0..077bb3c 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -85,11 +85,6 @@ const char* sg_disk_get_name(const_sg_disk_t disk)
   return disk->get_cname();
 }
 
-const char* sg_disk_name(const_sg_disk_t disk) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_disk_get_name(disk);
-}
-
 sg_host_t sg_disk_get_host(const_sg_disk_t disk)
 {
   return disk->get_host();
@@ -123,13 +118,3 @@ void sg_disk_set_data(sg_disk_t disk, void* data)
 {
   disk->set_data(data);
 }
-
-void* sg_disk_data(const_sg_disk_t disk) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_disk_get_data(disk);
-}
-
-void sg_disk_data_set(sg_disk_t disk, void* data) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_disk_set_data(disk, data);
-}

diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index 7a6c9c1..fa9d46c 100644 (file)
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -408,11 +408,6 @@ void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t
     (*disks)[i] = list[i];
 }
 
-void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_host_get_disks(host, disk_count, disks);
-}
-
 xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host) // XBT_ATTRIB_DEPRECATED_v330
 {
   xbt_assert((host != nullptr), "Invalid parameters");