Remove compile warnings with gcc-11+ / clang-16+ (#2119)

Co-authored-by: Florian OMNES <[email protected]>
AntaresSimulatorTeam · May 28, 2024 · 3e89b2e · 3e89b2e
1 parent 85a86f7
commit 3e89b2e
Show file tree

Hide file tree

Showing 68 changed files with 1,367 additions and 1,448 deletions.
diff --git a/src/libs/antares/study/include/antares/study/fwd.h b/src/libs/antares/study/include/antares/study/fwd.h
@@ -365,13 +365,10 @@ enum SeedIndex
     seedMax,
 };
 
-enum
-{
-    //! A default seed for random number generators
-    antaresSeedDefaultValue = 5489,
-    //! Increment for RNG (generators) with a different seed
-    antaresSeedIncrement = 1000000, // arbitrary value
-};
+//! A default seed for random number generators
+constexpr unsigned antaresSeedDefaultValue = 5489;
+//! Increment for RNG (generators) with a different seed
+constexpr unsigned antaresSeedIncrement = 1000000; // arbitrary value
 
 /*!
 ** \brief Convert a seed into a string

diff --git a/src/solver/variable/include/antares/solver/variable/adequacy/overallCost.h b/src/solver/variable/include/antares/solver/variable/adequacy/overallCost.h
@@ -61,29 +61,28 @@ struct VCardOverallCost
     //! The VCard to look for for calculating spatial aggregates
     typedef VCardOverallCost VCardForSpatialAggregate;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::area,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & (Category::FileLevel::id | Category::FileLevel::va),
-        //! Precision (views)
-        precision = Category::all,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +0,
-        //! Decimal precision
-        decimal = 0,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 1,
-        //! The Spatial aggregation
-        spatialAggregate = Category::spatialAggregateSum,
-        spatialAggregateMode = Category::spatialAggregateEachYear,
-        spatialAggregatePostProcessing = 0,
-        //! Intermediate values
-        hasIntermediateValues = 1,
-        //! Can this variable be non applicable (0 : no, 1 : yes)
-        isPossiblyNonApplicable = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & (Category::FileLevel::id
+                                                    | Category::FileLevel::va);
+    //! Precision (views)
+    static constexpr uint8_t precision = Category::all;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +0;
+    //! Decimal precision
+    static constexpr uint8_t decimal = 0;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 1;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::spatialAggregateSum;
+    static constexpr uint8_t spatialAggregateMode = Category::spatialAggregateEachYear;
+    static constexpr uint8_t spatialAggregatePostProcessing = 0;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 1;
+    //! Can this variable be non applicable (0 : no, 1 : yes)
+    static constexpr uint8_t isPossiblyNonApplicable = 0;
 
     typedef IntermediateValues IntermediateValuesBaseType;
     typedef IntermediateValues* IntermediateValuesType;

diff --git a/src/solver/variable/include/antares/solver/variable/adequacy/spilledEnergy.h b/src/solver/variable/include/antares/solver/variable/adequacy/spilledEnergy.h
@@ -62,29 +62,28 @@ struct VCardSpilledEnergy
     //! The VCard to look for for calculating spatial aggregates
     typedef VCardSpilledEnergy VCardForSpatialAggregate;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::area,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & (Category::FileLevel::id | Category::FileLevel::va),
-        //! Precision (views)
-        precision = Category::all,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +0,
-        //! Decimal precision
-        decimal = 0,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 1,
-        //! The Spatial aggregation
-        spatialAggregate = Category::spatialAggregateSum,
-        spatialAggregateMode = Category::spatialAggregateEachYear,
-        spatialAggregatePostProcessing = 0,
-        //! Intermediate values
-        hasIntermediateValues = 1,
-        //! Can this variable be non applicable (0 : no, 1 : yes)
-        isPossiblyNonApplicable = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & (Category::FileLevel::id
+                                                    | Category::FileLevel::va);
+    //! Precision (views)
+    static constexpr uint8_t precision = Category::all;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +0;
+    //! Decimal precision
+    static constexpr uint8_t decimal = 0;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 1;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::spatialAggregateSum;
+    static constexpr uint8_t spatialAggregateMode = Category::spatialAggregateEachYear;
+    static constexpr uint8_t spatialAggregatePostProcessing = 0;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 1;
+    //! Can this variable be non applicable (0 : no, 1 : yes)
+    static constexpr uint8_t isPossiblyNonApplicable = 0;
 
     typedef IntermediateValues IntermediateValuesBaseType;
     typedef IntermediateValues* IntermediateValuesType;

diff --git a/src/solver/variable/include/antares/solver/variable/area.h b/src/solver/variable/include/antares/solver/variable/area.h
@@ -52,21 +52,19 @@ struct VCardAllAreas
     //! The expecte results
     typedef Results<> ResultsType;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::area,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & Category::FileLevel::de,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +1,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 0,
-        //! The Spatial aggregation
-        spatialAggregate = Category::noSpatialAggregate,
-        //! Intermediate values
-        hasIntermediateValues = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & Category::FileLevel::de;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +1;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 0;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::noSpatialAggregate;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 0;
 
 }; // class VCard
 

diff --git a/src/solver/variable/include/antares/solver/variable/bindConstraints.h b/src/solver/variable/include/antares/solver/variable/bindConstraints.h
@@ -51,21 +51,19 @@ struct VCardAllBindingConstraints
     //! The expecte results
     typedef Results<> ResultsType;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::bindingConstraint,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & Category::FileLevel::bc,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +1,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 0,
-        //! The Spatial aggregation
-        spatialAggregate = Category::noSpatialAggregate,
-        //! Intermediate values
-        hasIntermediateValues = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::bindingConstraint;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & Category::FileLevel::bc;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +1;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 0;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::noSpatialAggregate;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 0;
 
 }; // class VCardAllBindingConstraints
 

diff --git a/src/solver/variable/include/antares/solver/variable/categories.h b/src/solver/variable/include/antares/solver/variable/categories.h
@@ -33,39 +33,39 @@ namespace Category
 {
 namespace DataLevel
 {
-    //! Data that belong to a single area
-    constexpr uint8_t area = 1;
-    //! Data that belong to a thermal dispatchable cluster
-    constexpr uint8_t thermalAggregate = 2;
-    //! Data that belong to a link
-    constexpr uint8_t link = 4;
-    //! Data that belong to a set
-    constexpr uint8_t setOfAreas = 8;
-    // Data belonging to a binding constraint
-    constexpr uint8_t bindingConstraint = 16;
-    //! The maximum available level
-    constexpr uint8_t maxDataLevel = 16;
-}
+//! Data that belong to a single area
+constexpr uint8_t area = 1;
+//! Data that belong to a thermal dispatchable cluster
+constexpr uint8_t thermalAggregate = 2;
+//! Data that belong to a link
+constexpr uint8_t link = 4;
+//! Data that belong to a set
+constexpr uint8_t setOfAreas = 8;
+// Data belonging to a binding constraint
+constexpr uint8_t bindingConstraint = 16;
+//! The maximum available level
+constexpr uint8_t maxDataLevel = 16;
+} // namespace DataLevel
 
 namespace FileLevel
 {
-    //! Values of physical variables
-    constexpr uint8_t va = 1;
-    //! Reference numbers
-    constexpr uint8_t id = 2;
-    //! Detailed values regarding thermal generation
-    constexpr uint8_t de = 4;
-    //! Detailed values regarding RES generation
-    constexpr uint8_t de_res = 8;
-    //! Detailed values regarding binding constraints
-    constexpr uint8_t bc = 16;
-    //! Detailed values regarding short term storage
-    constexpr uint8_t de_sts = 32;
-    //! The maximum available value
-    constexpr uint8_t maxFileLevel = 32;
-    //! All file level
-    constexpr uint8_t allFile = va | id | de | de_res | bc | de_sts;
-};
+//! Values of physical variables
+constexpr uint8_t va = 1;
+//! Reference numbers
+constexpr uint8_t id = 2;
+//! Detailed values regarding thermal generation
+constexpr uint8_t de = 4;
+//! Detailed values regarding RES generation
+constexpr uint8_t de_res = 8;
+//! Detailed values regarding binding constraints
+constexpr uint8_t bc = 16;
+//! Detailed values regarding short term storage
+constexpr uint8_t de_sts = 32;
+//! The maximum available value
+constexpr uint8_t maxFileLevel = 32;
+//! All file level
+constexpr uint8_t allFile = va | id | de | de_res | bc | de_sts;
+}; // namespace FileLevel
 
 enum Precision
 {
@@ -165,7 +165,7 @@ inline void DataLevelToStream(StreamT& out, int dataLevel)
 {
     switch (dataLevel)
     {
-    using namespace DataLevel;
+        using namespace DataLevel;
     case area:
         out += "area";
         break;
@@ -188,7 +188,7 @@ inline void FileLevelToStreamShort(StreamT& out, int fileLevel)
 {
     switch (fileLevel)
     {
-    using namespace FileLevel;
+        using namespace FileLevel;
     case va:
         out += "va";
         break;
@@ -217,7 +217,7 @@ inline void FileLevelToStream(StreamT& out, int fileLevel)
 {
     switch (fileLevel)
     {
-    using namespace FileLevel;
+        using namespace FileLevel;
     case va:
         out += "values";
         break;

diff --git a/src/solver/variable/include/antares/solver/variable/commons/hydro.h b/src/solver/variable/include/antares/solver/variable/commons/hydro.h
@@ -63,29 +63,28 @@ struct VCardTimeSeriesValuesHydro
     //! The VCard to look for for calculating spatial aggregates
     typedef VCardTimeSeriesValuesHydro VCardForSpatialAggregate;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::area,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & (Category::FileLevel::id | Category::FileLevel::va),
-        //! Precision (views)
-        precision = Category::all,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +0,
-        //! Decimal precision
-        decimal = 0,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 1,
-        //! The Spatial aggregation
-        spatialAggregate = Category::spatialAggregateSum,
-        spatialAggregateMode = Category::spatialAggregateEachYear,
-        spatialAggregatePostProcessing = 0,
-        //! Intermediate values
-        hasIntermediateValues = 1,
-        //! Can this variable be non applicable (0 : no, 1 : yes)
-        isPossiblyNonApplicable = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & (Category::FileLevel::id
+                                                    | Category::FileLevel::va);
+    //! Precision (views)
+    static constexpr uint8_t precision = Category::all;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +0;
+    //! Decimal precision
+    static constexpr uint8_t decimal = 0;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 1;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::spatialAggregateSum;
+    static constexpr uint8_t spatialAggregateMode = Category::spatialAggregateEachYear;
+    static constexpr uint8_t spatialAggregatePostProcessing = 0;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 1;
+    //! Can this variable be non applicable (0 : no, 1 : yes)
+    static constexpr uint8_t isPossiblyNonApplicable = 0;
 
     typedef IntermediateValues IntermediateValuesBaseType;
     typedef IntermediateValues* IntermediateValuesType;

diff --git a/src/solver/variable/include/antares/solver/variable/commons/join.h b/src/solver/variable/include/antares/solver/variable/commons/join.h
@@ -58,27 +58,26 @@ struct VCardJoin
             >>>>>
       ResultsType;
 
-    enum
-    {
-        //! Data Level
-        categoryDataLevel = Category::DataLevel::area,
-        //! File level (provided by the type of the results)
-        categoryFileLevel = ResultsType::categoryFile & (Category::FileLevel::id | Category::FileLevel::va),
-        //! Precision (views)
-        precision = Category::all,
-        //! Indentation (GUI)
-        nodeDepthForGUI = +0,
-        //! Decimal precision
-        decimal = 0,
-        //! Number of columns used by the variable (One ResultsType per column)
-        columnCount = 0,
-        //! The Spatial aggregation
-        spatialAggregate = Category::noSpatialAggregate,
-        spatialAggregateMode = Category::spatialAggregateEachYear,
-        spatialAggregatePostProcessing = 0,
-        //! Intermediate values
-        hasIntermediateValues = 0,
-    };
+    //! Data Level
+    static constexpr uint8_t categoryDataLevel = Category::DataLevel::area;
+    //! File level (provided by the type of the results)
+    static constexpr uint8_t categoryFileLevel = ResultsType::categoryFile
+                                                 & (Category::FileLevel::id
+                                                    | Category::FileLevel::va);
+    //! Precision (views)
+    static constexpr uint8_t precision = Category::all;
+    //! Indentation (GUI)
+    static constexpr uint8_t nodeDepthForGUI = +0;
+    //! Decimal precision
+    static constexpr uint8_t decimal = 0;
+    //! Number of columns used by the variable (One ResultsType per column)
+    static constexpr int columnCount = 0;
+    //! The Spatial aggregation
+    static constexpr uint8_t spatialAggregate = Category::noSpatialAggregate;
+    static constexpr uint8_t spatialAggregateMode = Category::spatialAggregateEachYear;
+    static constexpr uint8_t spatialAggregatePostProcessing = 0;
+    //! Intermediate values
+    static constexpr uint8_t hasIntermediateValues = 0;
 
 }; // class VCard
 
@@ -119,8 +118,8 @@ class Join: public Variable::IVariable<Join<LeftT, RightT, BindConstT>, Yuni::De
         enum
         {
             count = LeftType::template Statistics < CDataLevel,
-            CFile > ::count + RightType::template Statistics < CDataLevel,
-            CFile > ::count + BindConstType::template Statistics < CDataLevel,
+            CFile > ::count + (int)RightType::template Statistics < CDataLevel,
+            CFile > ::count + (int)BindConstType::template Statistics < CDataLevel,
             CFile > ::count,
         };
     };