A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into disk
[simgrid.git]
/
src
/
kernel
/
EngineImpl.hpp
diff --git
a/src/kernel/EngineImpl.hpp
b/src/kernel/EngineImpl.hpp
index
8593bf8
..
f824149
100644
(file)
--- a/
src/kernel/EngineImpl.hpp
+++ b/
src/kernel/EngineImpl.hpp
@@
-1,10
+1,11
@@
-/* Copyright (c) 2016-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
9
. 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. */
#include <simgrid/s4u/NetZone.hpp>
/* 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/s4u/NetZone.hpp>
-#include <simgrid/s4u/forward.hpp>
+
+#include <map>
#include <string>
#include <unordered_map>
#include <string>
#include <unordered_map>
@@
-12,14
+13,20
@@
namespace simgrid {
namespace kernel {
class EngineImpl {
namespace kernel {
class EngineImpl {
+ std::map<std::string, s4u::Host*> hosts_;
+ std::map<std::string, s4u::Link*> links_;
+ std::map<std::string, s4u::Storage*> storages_;
+ std::unordered_map<std::string, routing::NetPoint*> netpoints_;
+ friend s4u::Engine;
+
public:
public:
- EngineImpl();
- virtual ~EngineImpl();
- kernel::routing::NetZoneImpl* netRoot_ = nullptr;
+ EngineImpl() = default;
-private:
- std::unordered_map<std::string, simgrid::kernel::routing::NetPoint*> netpoints_;
- friend simgrid::s4u::Engine;
+ EngineImpl(const EngineImpl&) = delete;
+ EngineImpl& operator=(const EngineImpl&) = delete;
+ virtual ~EngineImpl();
+ routing::NetZoneImpl* netzone_root_ = nullptr;
};
};
-}
-}
+
+} // namespace kernel
+} // namespace simgrid