Fix scan-build warning (link may be null).

[simgrid.git] / src / s4u / s4u_activity.cpp

diff --git a/src/s4u/s4u_activity.cpp b/src/s4u/s4u_activity.cpp
index c49e2c4..01a6aad 100644 (file)
--- a/src/s4u/s4u_activity.cpp
+++ b/src/s4u/s4u_activity.cpp
@@ -1,27 +1,31 @@
-/* Copyright (c) 2006-2015. The SimGrid Team.
+/* Copyright (c) 2006-2018. 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. */
 
+#include "xbt/asserts.h"
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/Activity.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_activity,s4u,"S4U activities");
-using namespace simgrid;
 
-s4u::Activity::Activity() {
+namespace simgrid {
+namespace s4u {
 
+double Activity::get_remaining()
+{
+  return remains_;
 }
-s4u::Activity::~Activity() {
 
-}
-
-void s4u::Activity::setRemains(double remains) {
-  xbt_assert(state_ == inited, "Cannot change the remaining amount of work once the Activity is started");
+Activity* Activity::set_remaining(double remains)
+{
+  xbt_assert(state_ == State::inited, "Cannot change the remaining amount of work once the Activity is started");
   remains_ = remains;
+  return this;
 }
 
+}
+}