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 CRTP
[simgrid.git]
/
src
/
kernel
/
routing
/
NetPoint.cpp
diff --git
a/src/kernel/routing/NetPoint.cpp
b/src/kernel/routing/NetPoint.cpp
index
e1b0510
..
434f943
100644
(file)
--- a/
src/kernel/routing/NetPoint.cpp
+++ b/
src/kernel/routing/NetPoint.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
/* 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,17
+13,17
@@
namespace simgrid {
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-simgrid::xbt::signal<void(NetPoint
*)> NetPoint::onC
reation;
+simgrid::xbt::signal<void(NetPoint
&)> NetPoint::on_c
reation;
-NetPoint::NetPoint(
std::string
name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
+NetPoint::NetPoint(
const std::string&
name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
: name_(name), component_type_(componentType), englobing_zone_(netzone_p)
{
if (netzone_p != nullptr)
: name_(name), component_type_(componentType), englobing_zone_(netzone_p)
{
if (netzone_p != nullptr)
- id_ = netzone_p->add
C
omponent(this);
+ id_ = netzone_p->add
_c
omponent(this);
else
id_ = static_cast<decltype(id_)>(-1);
else
id_ = static_cast<decltype(id_)>(-1);
- simgrid::s4u::Engine::get
I
nstance()->netpoint_register(this);
- simgrid::kernel::routing::NetPoint::on
Creation(
this);
+ simgrid::s4u::Engine::get
_i
nstance()->netpoint_register(this);
+ simgrid::kernel::routing::NetPoint::on
_creation(*
this);
}
}
}
}
}
}
@@
-35,5
+35,5
@@
NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl*
*/
simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name)
{
*/
simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name)
{
- return simgrid::s4u::Engine::get
Instance()->getNetpointByNameOrN
ull(name);
+ return simgrid::s4u::Engine::get
_instance()->netpoint_by_name_or_n
ull(name);
}
}