X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be96606a051358ca1b0e8269f5150a7e3d53cab..dc9b8feaddd53842f6204f4f24409b2382393fa9:/include/simgrid/kernel/resource/Action.hpp diff --git a/include/simgrid/kernel/resource/Action.hpp b/include/simgrid/kernel/resource/Action.hpp index 955db666ed..ca8591819c 100644 --- a/include/simgrid/kernel/resource/Action.hpp +++ b/include/simgrid/kernel/resource/Action.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ @@ -12,6 +12,7 @@ #include #include +#include static constexpr int NO_MAX_DURATION = -1.0; @@ -41,7 +42,6 @@ public: void update(Action* action, double date, ActionHeap::Type type); void remove(Action* action); Action* pop(); - bool empty() const { return heap_type::empty(); } }; /** @details An action is a consumption on a resource (e.g.: a communication for the network). @@ -98,6 +98,8 @@ public: * @param var The lmm variable associated to this Action if it is part of a LMM component */ Action(Model* model, double cost, bool failed, lmm::Variable* var); + Action(const Action&) = delete; + Action& operator=(const Action&) = delete; virtual ~Action(); @@ -178,9 +180,9 @@ public: virtual void set_max_duration(double duration); /** @brief Get the tracing category associated to the current action */ - std::string get_category() const { return category_; } + const std::string& get_category() const { return category_; } /** @brief Set the tracing category of the current Action */ - void set_category(std::string category) { category_ = category; } + void set_category(const std::string& category) { category_ = category; } /** @brief Get the priority of the current Action */ double get_priority() const { return sharing_priority_; };