From e8353121ed52ca33c1788d0aef412fcd5c0db125 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 8 Jul 2018 00:46:51 +0200
Subject: [PATCH] CpuTiTmgr: change a C enum into an enum class

---
 src/surf/cpu_ti.cpp | 12 ++++++------
 src/surf/cpu_ti.hpp | 20 ++++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 08960f094c..bbc2ffa0be 100644
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -70,7 +70,7 @@ double CpuTiTmgr::integrate(double a, double b)
   if (fabs(a -b) < EPSILON)
     return 0.0;
 
-  if (type_ == TRACE_FIXED) {
+  if (type_ == Type::FIXED) {
     return ((b - a) * value_);
   }
 
@@ -158,7 +158,7 @@ double CpuTiTmgr::solve(double a, double amount)
     return a;
 
   /* Is the trace fixed ? */
-  if (type_ == TRACE_FIXED) {
+  if (type_ == Type::FIXED) {
     return (a + (amount / value_));
   }
 
@@ -232,7 +232,7 @@ CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(spee
 
   /* no availability file, fixed trace */
   if (not speed_trace) {
-    type_ = TRACE_FIXED;
+    type_  = Type::FIXED;
     value_ = value;
     XBT_DEBUG("No availability trace. Constant value = %f", value);
     return;
@@ -240,12 +240,12 @@ CpuTiTmgr::CpuTiTmgr(tmgr_trace_t speed_trace, double value) : speed_trace_(spee
 
   /* only one point available, fixed trace */
   if (speed_trace->event_list.size() == 1) {
-    type_  = TRACE_FIXED;
+    type_  = Type::FIXED;
     value_ = speed_trace->event_list.front().value_;
     return;
   }
 
-  type_ = TRACE_DYNAMIC;
+  type_ = Type::DYNAMIC;
 
   /* count the total time of trace file */
   for (auto const& val : speed_trace->event_list)
@@ -395,7 +395,7 @@ void CpuTi::apply_event(tmgr_trace_event_t event, double value)
     delete speed_integrated_trace_;
     speed_.scale = val.value_;
 
-    CpuTiTmgr* trace = new CpuTiTmgr(TRACE_FIXED, val.value_);
+    CpuTiTmgr* trace = new CpuTiTmgr(CpuTiTmgr::Type::FIXED, val.value_);
     XBT_DEBUG("value %f", val.value_);
 
     speed_integrated_trace_ = trace;
diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 9c6f0a85a0..df031110a3 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -6,13 +6,11 @@
 #ifndef SURF_MODEL_CPUTI_H_
 #define SURF_MODEL_CPUTI_H_
 
-#include <boost/intrusive/list.hpp>
-
-//#include <xbt/base.h>
-
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
+#include <boost/intrusive/list.hpp>
+
 namespace simgrid {
 namespace surf {
 
@@ -42,15 +40,13 @@ public:
   int binary_search(double* array, double a, int low, int high);
 };
 
-enum trace_type {
-
-  TRACE_FIXED,                /*< Trace fixed, no availability file */
-  TRACE_DYNAMIC               /*< Dynamic, have an availability file */
-};
-
 class CpuTiTmgr {
 public:
-  CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){};
+  enum class Type {
+    FIXED,  /*< Trace fixed, no availability file */
+    DYNAMIC /*< Dynamic, have an availability file */
+  };
+  CpuTiTmgr(Type type, double value) : type_(type), value_(value){};
   CpuTiTmgr(tmgr_trace_t speed_trace, double value);
   CpuTiTmgr(const CpuTiTmgr&) = delete;
   CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
@@ -60,7 +56,7 @@ public:
   double solve(double a, double amount);
   double get_power_scale(double a);
 
-  trace_type type_;
+  Type type_;
   double value_;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
-- 
2.20.1