Merge branch 'master' into adrien

[simgrid.git] / examples / s4u / io-file-system / s4u-io-file-system.cpp

diff --git a/examples/s4u/io-file-system/s4u-io-file-system.cpp b/examples/s4u/io-file-system/s4u-io-file-system.cpp
index 4c91e69..bdc6629 100644 (file)
--- a/examples/s4u/io-file-system/s4u-io-file-system.cpp
+++ b/examples/s4u/io-file-system/s4u-io-file-system.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2020. 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. */
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "a sample log category");
 
 class MyHost {
 public:
-  void show_info(std::vector<simgrid::s4u::Disk*> const& disks)
+  void show_info(std::vector<simgrid::s4u::Disk*> const& disks) const
   {
     XBT_INFO("Storage info on %s:", simgrid::s4u::Host::current()->get_cname());
 
@@ -24,7 +24,7 @@ public:
     }
   }
 
-  void operator()()
+  void operator()() const
   {
     std::vector<simgrid::s4u::Disk*> const& disks = simgrid::s4u::Host::current()->get_disks();
 
@@ -56,8 +56,8 @@ public:
     file->move(newpath);
 
     // Test attaching some user data to the file
-    file->set_userdata(new std::string("777"));
-    std::string* file_data = static_cast<std::string*>(file->get_userdata());
+    file->set_data(new std::string("777"));
+    const std::string* file_data = static_cast<std::string*>(file->get_data());
     XBT_INFO("User data attached to the file: %s", file_data->c_str());
     delete file_data;