From: Adrien <adrien.gougeon@ens-rennes.fr>
Date: Tue, 10 Oct 2023 14:30:21 +0000 (+0000)
Subject: Merge branch 'master' into 'task-dispatch'
X-Git-Tag: v3.35~93^2
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ab3cbced11b7b421cd6bbf9721a1dc6685072ed4

Merge branch 'master' into 'task-dispatch'

# Conflicts:
#   docs/source/app_s4u.rst
#   examples/cpp/CMakeLists.txt
#   include/simgrid/s4u/Task.hpp
#   src/s4u/s4u_Task.cpp
---

ab3cbced11b7b421cd6bbf9721a1dc6685072ed4
diff --cc examples/cpp/CMakeLists.txt
index c2e2b144fa,2ddf038320..b917540cf1
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@@ -172,8 -172,8 +172,8 @@@ foreach (example activityset-testany ac
                   mc-bugged1 mc-bugged1-liveness mc-bugged2 mc-bugged2-liveness mc-centralized-mutex mc-electric-fence mc-failing-assert
                   network-ns3 network-ns3-wifi network-wifi
                   io-async io-priority io-degradation io-file-system io-file-remote io-disk-raw io-dependent
 -                 task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load 
 +                 task-dispatch task-io task-microservice task-parallelism task-simple task-storm task-switch-host task-variable-load
-                  photovoltaic-simple
+                  solar-panel-simple
                   platform-comm-serialize platform-failures platform-profile platform-properties
                   plugin-host-load plugin-jbod plugin-link-load plugin-prodcons
                   replay-comm replay-io