From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 24 Jul 2017 20:10:40 +0000 (+0200)
Subject: Merge branch 'master' of github.com:simgrid/simgrid
X-Git-Tag: v3_17~322^2~4
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c7cad16a187e10f78f94c63a490f474676702424?ds=inline;hp=-c

Merge branch 'master' of github.com:simgrid/simgrid
---

c7cad16a187e10f78f94c63a490f474676702424
diff --combined src/s4u/s4u_engine.cpp
index 8df13cd410,71a2345d77..e061713a9c
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@@ -35,7 -35,7 +35,7 @@@ Engine::Engine(int *argc, char **argv) 
    s4u::Engine::instance_ = this;
    pimpl                  = new kernel::EngineImpl();
  
-   TRACE_global_init(argc, argv);
+   TRACE_global_init();
    SIMIX_global_init(argc, argv);
  }
  
@@@ -128,11 -128,9 +128,11 @@@ NetZone* Engine::getNetzoneByNameOrNull
  /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
  simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(const char* name)
  {
 -  if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
 +  try {
 +    return pimpl->netpoints_.at(name);
 +  } catch (std::out_of_range& unfound) {
      return nullptr;
 -  return pimpl->netpoints_.at(name);
 +  }
  }
  /** @brief Fill the provided vector with all existing netpoints */
  void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)