From dee0c55574ca8296b8e74d5c611cfc7db43e0d31 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 5 Feb 2021 15:43:50 +0100
Subject: [PATCH] Use XBT_DECLARE_ENUM_CLASS for s4u::Activity::State.

---
 include/simgrid/s4u/Activity.hpp | 4 +++-
 src/s4u/s4u_Activity.cpp         | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 22fa0a7649..ab1e57bb80 100644
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 #include <xbt/signal.hpp>
+#include <xbt/utility.hpp>
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u_activity);
 
@@ -69,7 +70,8 @@ public:
   Activity& operator=(Activity const&) = delete;
 #endif
 
-  enum class State { INITED = 0, STARTING, STARTED, CANCELED, FINISHED };
+  // enum class State { ... }
+  XBT_DECLARE_ENUM_CLASS(State, INITED, STARTING, STARTED, CANCELED, FINISHED);
 
   /** Starts a previously created activity.
    *
diff --git a/src/s4u/s4u_Activity.cpp b/src/s4u/s4u_Activity.cpp
index 8845969fc0..21efeb93c2 100644
--- a/src/s4u/s4u_Activity.cpp
+++ b/src/s4u/s4u_Activity.cpp
@@ -69,8 +69,7 @@ Activity* Activity::resume()
 
 const char* Activity::get_state_str() const
 {
-  constexpr std::array<const char*, 5> names{{"INITED", "STARTING", "STARTED", "CANCELED", "FINISHED"}};
-  return names[static_cast<int>(state_)];
+  return to_c_str(state_);
 }
 
 double Activity::get_remaining() const
-- 
2.20.1