Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / src / kernel / resource / Model.cpp

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index 1ae513a..6006754 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -1,16 +1,15 @@
-/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2023. 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 "simgrid/kernel/resource/Model.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "xbt/ex.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_resource);
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 Model::Model(const std::string& name) : name_(name)
 {
@@ -119,8 +118,7 @@ double Model::next_occurring_event_full(double /*now*/)
   double min = -1;
 
   for (Action& action : *get_started_action_set()) {
-    double value = action.get_rate();
-    if (value > 0) {
+    if (double value = action.get_rate(); value > 0) {
       if (action.get_remains() > 0)
         value = action.get_remains_no_update() / value;
       else
@@ -182,6 +180,4 @@ void Model::update_actions_state_full(double /*now*/, double /*delta*/)
   THROW_UNIMPLEMENTED;
 }
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource