From 9b60e270c5fe98fb6c528164aa9c6e4e6045f7e0 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 23 Jun 2018 21:14:17 +0200 Subject: [PATCH] snake_case routing::NetPoint --- include/simgrid/kernel/routing/NetPoint.hpp | 2 +- src/instr/instr_platform.cpp | 2 +- src/kernel/routing/NetPoint.cpp | 4 ++-- src/surf/network_ns3.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp index 77d184e7d0..046cd45382 100644 --- a/include/simgrid/kernel/routing/NetPoint.hpp +++ b/include/simgrid/kernel/routing/NetPoint.hpp @@ -40,7 +40,7 @@ public: bool is_host() { return component_type_ == Type::Host; } bool is_router() { return component_type_ == Type::Router; } - static simgrid::xbt::signal onCreation; + static simgrid::xbt::signal on_creation; bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; } diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index ec0639d4a6..a9ba36935f 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -352,7 +352,7 @@ void instr_define_callbacks() simgrid::s4u::Link::on_creation.connect(instr_link_on_creation); simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change); simgrid::s4u::NetZone::on_seal.connect([](simgrid::s4u::NetZone& /*netzone*/) { currentContainer.pop_back(); }); - simgrid::kernel::routing::NetPoint::onCreation.connect(instr_netpoint_on_creation); + simgrid::kernel::routing::NetPoint::on_creation.connect(instr_netpoint_on_creation); } simgrid::s4u::NetZone::on_creation.connect(instr_netzone_on_creation); diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp index 6326cf27a9..6a23274eaf 100644 --- a/src/kernel/routing/NetPoint.cpp +++ b/src/kernel/routing/NetPoint.cpp @@ -13,7 +13,7 @@ namespace simgrid { namespace kernel { namespace routing { -simgrid::xbt::signal NetPoint::onCreation; +simgrid::xbt::signal NetPoint::on_creation; NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* netzone_p) : name_(name), component_type_(componentType), englobing_zone_(netzone_p) @@ -23,7 +23,7 @@ NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* else id_ = static_cast(-1); simgrid::s4u::Engine::get_instance()->netpoint_register(this); - simgrid::kernel::routing::NetPoint::onCreation(this); + simgrid::kernel::routing::NetPoint::on_creation(this); } } } diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 15a1618caa..a35400cc9f 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -159,7 +159,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel(Model::UpdateAlgo::FULL) ns3_initialize(ns3_tcp_model.get().c_str()); - simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) { + simgrid::kernel::routing::NetPoint::on_creation.connect([](simgrid::kernel::routing::NetPoint* pt) { pt->extension_set(new NetPointNs3()); XBT_VERB("SimGrid's %s is known as node %d within NS3", pt->get_cname(), pt->extension()->node_num); }); -- 2.20.1