cut another bunch of include

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

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index e437850..780d5c7 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -3,14 +3,13 @@
 /* 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. */
 
-#include "simgrid/kernel/resource/Resource.hpp"
-#include "simgrid/msg.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
-#include "simgrid/simix.hpp"
-#include "src/plugins/file_system/FileSystem.hpp"
+#include "simgrid/storage.h"
 #include "src/surf/StorageImpl.hpp"
+
+#include <string>
 #include <unordered_map>
 
 namespace simgrid {
@@ -25,7 +24,7 @@ void XBT_ATTRIB_DEPRECATED_v322(
     getStorageList(std::map<std::string, Storage*>* whereTo)
 {
   for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages())
-    whereTo->insert({s->getName(), s});
+    whereTo->insert({s->get_name(), s});
 }
 
 Storage::Storage(std::string name, surf::StorageImpl* pimpl) : pimpl_(pimpl), name_(name)
@@ -38,12 +37,12 @@ Storage* Storage::byName(std::string name)
   return Engine::getInstance()->storageByNameOrNull(name);
 }
 
-const std::string& Storage::getName() const
+const std::string& Storage::get_name() const
 {
   return name_;
 }
 
-const char* Storage::getCname() const
+const char* Storage::get_cname() const
 {
   return name_.c_str();
 }
@@ -93,7 +92,7 @@ simgrid::xbt::signal<void(s4u::Storage&)> Storage::onDestruction;
 } /* namespace simgrid */
 
 /* **************************** Public C interface *************************** */
-SG_BEGIN_DECL()
+
 /** @addtogroup sg_storage_management
  * (#sg_storage_t) and the functions for managing it.
  */
@@ -107,13 +106,13 @@ SG_BEGIN_DECL()
 const char* sg_storage_get_name(sg_storage_t storage)
 {
   xbt_assert((storage != nullptr), "Invalid parameters");
-  return storage->getCname();
+  return storage->get_cname();
 }
 
 const char* sg_storage_get_host(sg_storage_t storage)
 {
   xbt_assert((storage != nullptr), "Invalid parameters");
-  return storage->getHost()->getCname();
+  return storage->getHost()->get_cname();
 }
 
 /** \ingroup sg_storage_management
@@ -141,7 +140,7 @@ xbt_dict_t sg_storage_get_properties(sg_storage_t storage)
  * \param name a property name
  * \param value what to change the property to
  */
-void sg_storage_set_property_value(sg_storage_t storage, const char* name, char* value)
+void sg_storage_set_property_value(sg_storage_t storage, const char* name, const char* value)
 {
   storage->setProperty(name, value);
 }
@@ -200,4 +199,3 @@ sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size)
 {
   return storage->write(size);
 }
-SG_END_DECL()