X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9104957deccc59e0e804215d5db498fabfd40d29..8de45b91df7811aa39c11647cfccd14be6d2db89:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 07d9b498ca..25da95860e 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2021. 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. */ @@ -25,7 +25,7 @@ class Task : public xbt::Extendable { std::string tracing_category_ = ""; long long int id_; - double timeout_ = 0.0; + double timeout_ = -1; /* Default timeout is infinite */ double priority_ = 1.0; double bound_ = 0.0; /* Capping for CPU resource, or 0 for no capping */ double rate_ = -1; /* Capping for network resource, or -1 for no capping*/ @@ -49,7 +49,6 @@ public: Task(const Task&) = delete; Task& operator=(const Task&) = delete; - ~Task() = default; bool is_used() const { return is_used_; } bool is_parallel() const { return parallel_; } @@ -62,8 +61,6 @@ public: void set_tracing_category(const char* category) { tracing_category_ = category ? category : ""; } const std::string& get_tracing_category() const { return tracing_category_; } bool has_tracing_category() { return not tracing_category_.empty(); } - XBT_ATTRIB_DEPRECATED_v329("Please use set_data()") void* get_user_data() { return get_data(); } - XBT_ATTRIB_DEPRECATED_v329("Please use get_data()") void set_user_data(void* data) { set_data(data); } long long int get_id() const { return id_; } double get_priority() const { return priority_; } void set_priority(double priority);