From 2c61e30e8ce6bb4959cb289359a184b6de94ffd6 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 3 May 2019 12:41:01 +0200 Subject: [PATCH] Rename fields to follow coding syle and unshadow from local parameters. --- src/kernel/actor/ActorImpl.cpp | 4 ++-- src/kernel/actor/ActorImpl.hpp | 4 ++-- src/plugins/file_system/s4u_FileSystem.cpp | 2 +- src/surf/StorageImpl.cpp | 2 +- src/surf/StorageImpl.hpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 18ca939b97..c44afb237b 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -85,7 +85,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h ActorImpl* actor = new ActorImpl(xbt::string(name), host); /* Actor data */ actor->set_user_data(data); - actor->code = nullptr; + actor->code_ = nullptr; XBT_VERB("Create context %s", actor->get_cname()); xbt_assert(simix_global != nullptr, "simix is not initialized, please call MSG_init first"); @@ -459,7 +459,7 @@ ActorImpl* ActorImpl::start(const simix::ActorCode& code) std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Cannot start actor on failed host."))); } - this->code = code; + this->code_ = code; XBT_VERB("Create context %s", get_cname()); context_.reset(simix_global->context_factory->create_context(simix::ActorCode(code), this)); diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index 98336cfb4d..6e4dd5a80c 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -68,7 +68,7 @@ public: std::shared_ptr>> on_exit = std::make_shared>>(); - std::function code; + std::function code_; simix::Timer* kill_timer = nullptr; private: @@ -160,7 +160,7 @@ public: explicit ProcessArg(s4u::Host* host, ActorImpl* actor) : name(actor->get_name()) - , code(actor->code) + , code(actor->code_) , data(actor->get_user_data()) , host(host) , kill_time(actor->get_kill_time()) diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp index bf1781d05b..eb6ccb3a6b 100644 --- a/src/plugins/file_system/s4u_FileSystem.cpp +++ b/src/plugins/file_system/s4u_FileSystem.cpp @@ -294,7 +294,7 @@ int File::remote_move(sg_host_t host, const char* fullpath) FileSystemStorageExt::FileSystemStorageExt(simgrid::s4u::Storage* ptr) { - content_.reset(parse_content(ptr->get_impl()->content_name)); + content_.reset(parse_content(ptr->get_impl()->content_name_)); size_ = ptr->get_impl()->size_; } diff --git a/src/surf/StorageImpl.cpp b/src/surf/StorageImpl.cpp index 9cdc5544eb..31851772ae 100644 --- a/src/surf/StorageImpl.cpp +++ b/src/surf/StorageImpl.cpp @@ -41,7 +41,7 @@ StorageImpl::StorageImpl(kernel::resource::Model* model, const std::string& name : Resource(model, name, maxminSystem->constraint_new(this, std::max(bread, bwrite))) , piface_(name, this) , typeId_(type_id) - , content_name(content_name) + , content_name_(content_name) , size_(size) , attach_(attach) { diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index ff68774eb4..ab66f327ed 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -104,7 +104,7 @@ public: lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ std::string typeId_; - std::string content_name; // Only used at parsing time then goes to the FileSystemExtension + std::string content_name_; // Only used at parsing time then goes to the FileSystemExtension sg_size_t size_; // Only used at parsing time then goes to the FileSystemExtension private: -- 2.20.1