Merge with simgrid/master

[simgrid.git] / include / simgrid / disk.h

diff --git a/include/simgrid/disk.h b/include/simgrid/disk.h
index e0c8874b19fb22e89ceeb4da5eee1d5d17e1a519..ef71b3fab8bac9c0ae68968889538f2c843547e2 100644 (file)
--- a/include/simgrid/disk.h
+++ b/include/simgrid/disk.h
@@ -11,7 +11,7 @@
 
 /* C interface */
 SG_BEGIN_DECL
-XBT_PUBLIC const char* sg_disk_name(const_sg_disk_t disk);
+XBT_PUBLIC const char* sg_disk_get_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);
@@ -19,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_ */