From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 24 Apr 2018 18:41:40 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3.20~325^2~7
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5e22c862d29ac2455672f2bc7f50bbcc9ade21c2

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
---

5e22c862d29ac2455672f2bc7f50bbcc9ade21c2
diff --cc src/surf/storage_n11.cpp
index 53b75032e7,6a709c7ad6..6d71df79d1
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@@ -17,9 -17,9 +17,9 @@@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_
   *************/
  extern std::map<std::string, simgrid::surf::StorageType*> storage_types;
  
 -static void check_disk_attachment()
 +void check_disk_attachment()
  {
-   for (auto const& s : simgrid::s4u::Engine::getInstance()->getAllStorages()) {
+   for (auto const& s : simgrid::s4u::Engine::getInstance()->get_all_storages()) {
      simgrid::kernel::routing::NetPoint* host_elm = sg_netpoint_by_name_or_null(s->getImpl()->getHost().c_str());
      if (not host_elm)
        surf_parse_error(std::string("Unable to attach storage ") + s->get_cname() + ": host " +