Merge branch 'master' of https://framagit.org/simgrid/simgrid

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

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index 100dc6e..10b19e4 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -52,7 +52,7 @@ void Disk::set_property(const std::string& key, const std::string& value)
 
 IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
 {
-  return IoPtr(new Io(this, size, type));
+  return Io::init()->set_disk(this)->set_size(size)->set_op_type(type);
 }
 
 IoPtr Disk::read_async(sg_size_t size)
@@ -80,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();
 }
@@ -118,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);
-}