Merge selected changes from branch 'simgrid-Jesse-McDonald-master-patch-09242'

[simgrid.git] / src / kernel / resource / profile / FutureEvtSet.cpp

diff --git a/src/kernel/resource/profile/FutureEvtSet.cpp b/src/kernel/resource/profile/FutureEvtSet.cpp
index f12265b28f0a5d6fb34275f3bc733b8c76c25199..dae5708840d95f35b54cffa2d7642d0812fe3f49 100644 (file)
--- a/src/kernel/resource/profile/FutureEvtSet.cpp
+++ b/src/kernel/resource/profile/FutureEvtSet.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2022. 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. */
@@ -7,9 +7,7 @@
 #include "src/kernel/resource/profile/Event.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
 
-namespace simgrid {
-namespace kernel {
-namespace profile {
+namespace simgrid::kernel::profile {
 
 simgrid::kernel::profile::FutureEvtSet future_evt_set; // FIXME: singleton antipattern
 
@@ -37,8 +35,7 @@ double FutureEvtSet::next_date() const
 /** @brief Retrieves the next occurring event, or nullptr if none happens before date */
 Event* FutureEvtSet::pop_leq(double date, double* value, resource::Resource** resource)
 {
-  double event_date = next_date();
-  if (event_date > date || heap_.empty())
+  if (next_date() > date || heap_.empty())
     return nullptr;
 
   Event* event       = heap_.top().second;
@@ -52,6 +49,4 @@ Event* FutureEvtSet::pop_leq(double date, double* value, resource::Resource** re
 
   return event;
 }
-} // namespace profile
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::profile