Merge branch 'Adrien.Gougeon/simgrid-master'

[simgrid.git] / src / s4u / s4u_Disk.cpp

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index d75db46..077bb3c 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -7,6 +7,7 @@
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Io.hpp"
+#include "simgrid/simix.hpp"
 #include "src/kernel/resource/DiskImpl.hpp"
 
 namespace simgrid {
@@ -79,7 +80,7 @@ sg_size_t Disk::write(sg_size_t size)
 
 /* **************************** Public C interface *************************** */
 
-const char* sg_disk_name(const_sg_disk_t disk)
+const char* sg_disk_get_name(const_sg_disk_t disk)
 {
   return disk->get_cname();
 }
@@ -107,11 +108,13 @@ sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size)
 {
   return disk->write(size);
 }
-void* sg_disk_data(const_sg_disk_t disk)
+
+void* sg_disk_get_data(const_sg_disk_t disk)
 {
   return disk->get_data();
 }
-void sg_disk_data_set(sg_disk_t disk, void* data)
+
+void sg_disk_set_data(sg_disk_t disk, void* data)
 {
   disk->set_data(data);
 }