Fix clang warnings (#1776)

* Fix clang warnings * Fix gcc compilation * Improve readability
AntaresSimulatorTeam · Nov 17, 2023 · 4c9b101 · 4c9b101
1 parent e68838b
commit 4c9b101
Show file tree

Hide file tree

Showing 30 changed files with 60 additions and 56 deletions.
diff --git a/src/ext/yuni/src/yuni/core/logs/handler/file.hxx b/src/ext/yuni/src/yuni/core/logs/handler/file.hxx
@@ -61,7 +61,7 @@ void File<NextHandler>::internalDecoratorWriteWL(LoggerT& logger, const AnyStrin
 {
     if (pFile.opened())
     {
-        typedef typename LoggerT::DecoratorsType DecoratorsType;
+        using DecoratorsType = typename LoggerT::DecoratorsType;
         // Append the message to the file
         logger.DecoratorsType::template internalDecoratorAddPrefix<File, VerbosityType>(pFile, s);
 

diff --git a/src/ext/yuni/src/yuni/core/logs/handler/stdcout.h b/src/ext/yuni/src/yuni/core/logs/handler/stdcout.h
@@ -34,12 +34,10 @@ class YUNI_DECL StdCout : public NextHandler
         colorsAllowed = YUNI_LOGS_COLORS_ALLOWED,
     };
 
-public:
     template<class LoggerT, class VerbosityType>
     void internalDecoratorWriteWL(LoggerT& logger, const AnyString& s) const
     {
-        typedef typename LoggerT::DecoratorsType DecoratorsType;
-
+        using DecoratorsType = typename LoggerT::DecoratorsType;
         // Write the message to the std::cout/cerr
         if (VerbosityType::shouldUsesStdCerr)
         {

diff --git a/src/ext/yuni/src/yuni/core/nullable/extension.hxx b/src/ext/yuni/src/yuni/core/nullable/extension.hxx
@@ -17,7 +17,7 @@ namespace Extension
 namespace CString
 {
 template<class CStringT, class T, class Alloc>
-struct Append<CStringT, Yuni::Nullable<T, Alloc>> final
+class Append<CStringT, Yuni::Nullable<T, Alloc>> final
 {
     static void Perform(CStringT& s, const Yuni::Nullable<T, Alloc>& rhs)
     {

diff --git a/src/ext/yuni/src/yuni/core/nullable/nullable.hxx b/src/ext/yuni/src/yuni/core/nullable/nullable.hxx
@@ -290,14 +290,14 @@ inline void Nullable<T, Alloc>::print(S& out, const U& nullValue) const
 }
 
 template<class T, class Alloc>
-inline typename Nullable<T, Alloc>::reference Nullable<T, Alloc>::operator[](size_type n)
+inline typename Nullable<T, Alloc>::reference Nullable<T, Alloc>::operator[](size_type)
 {
     return pHolder.reference();
 }
 
 template<class T, class Alloc>
 inline typename Nullable<T, Alloc>::const_reference Nullable<T, Alloc>::operator[](
-  size_type n) const
+  size_type) const
 {
     return pHolder.reference();
 }
@@ -327,7 +327,7 @@ inline typename Nullable<T, Alloc>::const_reference Nullable<T, Alloc>::back() c
 }
 
 template<class T, class Alloc>
-inline bool Nullable<T, Alloc>::operator<(const Nullable& rhs) const
+inline bool Nullable<T, Alloc>::operator<(const Nullable&) const
 {
     return false;
 }

diff --git a/src/libs/antares/array/antares/array/matrix-to-buffer.h b/src/libs/antares/array/antares/array/matrix-to-buffer.h
@@ -46,8 +46,7 @@ class I_mtx_to_buffer_dumper;
 class matrix_to_buffer_dumper_factory
 {
 public:
-    matrix_to_buffer_dumper_factory(bool isDecimal, uint precision) :
-     any_decimal_(isDecimal and precision)
+    matrix_to_buffer_dumper_factory()
     {
     }
 
@@ -59,9 +58,6 @@ class matrix_to_buffer_dumper_factory
     I_mtx_to_buffer_dumper<T, ReadWriteT, PredicateT>* get_dumper(const Matrix<T, ReadWriteT>* mtx,
                                                                   std::string& data,
                                                                   PredicateT& predicate);
-
-private:
-    bool any_decimal_;
 };
 
 template<class T, class ReadWriteT, class PredicateT>

diff --git a/src/libs/antares/array/antares/array/matrix.hxx b/src/libs/antares/array/antares/array/matrix.hxx
@@ -1136,7 +1136,7 @@ void Matrix<T, ReadWriteT>::saveToBuffer(std::string& data,
         // Does nothing if the matrix only contains zero
         return;
 
-    matrix_to_buffer_dumper_factory mtx_to_buffer_dumper_factory(isDecimal, precision);
+    matrix_to_buffer_dumper_factory mtx_to_buffer_dumper_factory;
 
     I_mtx_to_buffer_dumper<T, ReadWriteT, PredicateT>* mtx_to_buffer_dpr
       = mtx_to_buffer_dumper_factory.get_dumper<T, ReadWriteT, PredicateT>(this, data, predicate);

diff --git a/src/libs/antares/benchmarking/include/antares/benchmarking/DurationCollector.h b/src/libs/antares/benchmarking/include/antares/benchmarking/DurationCollector.h
@@ -13,13 +13,15 @@ namespace Benchmarking
 class IDurationCollector
 {
 public:
+    virtual ~IDurationCollector() = default;
     virtual void addDuration(const std::string& name, int64_t duration) = 0;
 };
 
 class NullDurationCollector : public IDurationCollector
 {
 public:
     NullDurationCollector() = default;
+    virtual ~NullDurationCollector() = default;
     void addDuration(const std::string& /* name */, int64_t /* duration */) override
     { /* Do nothing */
     }
@@ -29,6 +31,7 @@ class DurationCollector : public IDurationCollector
 {
 public:
     DurationCollector() = default;
+    virtual ~DurationCollector() = default;
 
     void toFileContent(FileContent& file_content);
     void addDuration(const std::string& name, int64_t duration) override;

diff --git a/src/libs/antares/object/intrusive-reference.hxx b/src/libs/antares/object/intrusive-reference.hxx
@@ -43,14 +43,14 @@ inline IIntrusiveReference<ChildT, TP>::~IIntrusiveReference()
 
 template<class ChildT, template<class> class TP>
 inline IIntrusiveReference<ChildT, TP>::IIntrusiveReference(
-  const IIntrusiveReference<ChildT, TP>& rhs) :
+  [[maybe_unused]] const IIntrusiveReference<ChildT, TP>& rhs) :
  pRefCount(0)
 {
 }
 
 template<class ChildT, template<class> class TP>
 inline IIntrusiveReference<ChildT, TP>& IIntrusiveReference<ChildT, TP>::operator=(
-  const IIntrusiveReference& rhs) const
+  [[maybe_unused]] const IIntrusiveReference& rhs) const
 {
     // Does nothing
     return *this;

diff --git a/src/libs/antares/study/runtime/runtime.cpp b/src/libs/antares/study/runtime/runtime.cpp
@@ -443,7 +443,6 @@ StudyRuntimeInfos::~StudyRuntimeInfos()
 #ifndef NDEBUG
 void StudyRangeLimits::checkIntegrity() const
 {
-    assert(this != nullptr);
     assert(hour[rangeBegin] <= hour[rangeEnd]);
     assert(day[rangeBegin] <= day[rangeEnd]);
     assert(hour[rangeBegin] < 9000); // arbitrary value

diff --git a/src/libs/antares/study/scenario-builder/TSnumberData.h b/src/libs/antares/study/scenario-builder/TSnumberData.h
@@ -65,17 +65,12 @@ class TSNumberData : public dataInterface
     void setTSnumber(uint index, uint year, uint value);
     //@}
 
-    uint width() const;
-    uint height() const;
+    uint width() const override;
+    uint height() const override;
 
     double get_value(uint x, uint y) const;
     void set_value(uint x, uint y, uint value);
 
-    /*
-    ** Give the study an access to TS numbers scenarii
-    */
-    virtual bool apply(Study& study) = 0;
-
 protected:
     virtual CString<512, false> get_prefix() const = 0;
 

diff --git a/src/libs/antares/study/scenario-builder/ThermalTSNumberData.h b/src/libs/antares/study/scenario-builder/ThermalTSNumberData.h
@@ -11,6 +11,7 @@ class thermalTSNumberData : public TSNumberData
 {
 public:
     thermalTSNumberData() = default;
+    virtual ~thermalTSNumberData() = default;
 
     bool reset(const Study& study) override;
     void saveToINIFile(const Study& study, Yuni::IO::File::Stream& file) const override;

diff --git a/src/solver/application.h b/src/solver/application.h
@@ -13,7 +13,7 @@
 
 namespace Antares::Solver
 {
-class Application : public Yuni::IEventObserver<Application, Yuni::Policy::SingleThreaded>
+class Application final : public Yuni::IEventObserver<Application, Yuni::Policy::SingleThreaded>
 {
 public:
     //! \name Constructor & Destructor

diff --git a/src/solver/constraints-builder/grid.hxx b/src/solver/constraints-builder/grid.hxx
@@ -470,7 +470,7 @@ typename Grid<NodeT>::VectorEdgeP Grid<NodeT>::findShortestPath(NodeP node1, Nod
     Grid::VectorEdgeP path;
     Grid::NodeP currentNode = node2;
 
-    while (!prev[currentNode] == 0)
+    while (prev[currentNode] != nullptr)
     {
         path.push_back(adjency.at(currentNode).at(prev[currentNode]));
         currentNode = prev[currentNode];

diff --git a/src/solver/simulation/BindingConstraintsTimeSeriesNumbersWriter.h b/src/solver/simulation/BindingConstraintsTimeSeriesNumbersWriter.h
@@ -14,7 +14,7 @@ class BindingConstraintsTimeSeriesNumbersWriter: public ITimeSeriesNumbersWriter
 
 public:
     explicit BindingConstraintsTimeSeriesNumbersWriter(IResultWriter& resultWriter);
-    BindingConstraintsTimeSeriesNumbersWriter() = default;
+    BindingConstraintsTimeSeriesNumbersWriter() = delete;
     void write(const Data::BindingConstraintGroupRepository &bindingConstraintGroupRepository) override;
 
 private:

diff --git a/src/solver/simulation/adequacy.h b/src/solver/simulation/adequacy.h
@@ -104,7 +104,6 @@ class Adequacy
     uint pNbWeeks;
     uint pStartTime;
     uint pNbMaxPerformedYearsInParallel;
-    bool pPreproOnly;
     std::vector<PROBLEME_HEBDO> pProblemesHebdo;
     Matrix<> pRES;
     IResultWriter& resultWriter;

diff --git a/src/solver/simulation/economy.h b/src/solver/simulation/economy.h
@@ -101,7 +101,6 @@ class Economy
     uint pNbWeeks;
     uint pStartTime;
     uint pNbMaxPerformedYearsInParallel;
-    bool pPreproOnly;
     std::vector<PROBLEME_HEBDO> pProblemesHebdo;
     std::vector<std::unique_ptr<Antares::Solver::Optimization::WeeklyOptimization>> weeklyOptProblems_;
     std::vector<std::unique_ptr<interfacePostProcessList>> postProcessesList_;

diff --git a/src/solver/simulation/solver.hxx b/src/solver/simulation/solver.hxx
@@ -905,7 +905,7 @@ void ISimulation<Impl>::computeAnnualCostsStatistics(
     }
 }
 
-static void logPerformedYearsInAset(setOfParallelYears& set)
+static inline void logPerformedYearsInAset(setOfParallelYears& set)
 {
     logs.info() << "parallel batch size : " << set.nbYears << " (" << set.nbPerformedYears
                 << " perfomed)";

diff --git a/src/solver/simulation/timeseries-numbers.cpp b/src/solver/simulation/timeseries-numbers.cpp
@@ -126,6 +126,7 @@ class areaNumberOfTSretriever
 class loadAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~loadAreaNumberOfTSretriever() = default;
     loadAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }
@@ -143,6 +144,7 @@ class loadAreaNumberOfTSretriever : public areaNumberOfTSretriever
 class hydroAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~hydroAreaNumberOfTSretriever() = default;
     hydroAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }
@@ -160,6 +162,7 @@ class hydroAreaNumberOfTSretriever : public areaNumberOfTSretriever
 class windAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~windAreaNumberOfTSretriever() = default;
     windAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }
@@ -177,6 +180,7 @@ class windAreaNumberOfTSretriever : public areaNumberOfTSretriever
 class solarAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~solarAreaNumberOfTSretriever() = default;
     solarAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }
@@ -194,6 +198,7 @@ class solarAreaNumberOfTSretriever : public areaNumberOfTSretriever
 class thermalAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~thermalAreaNumberOfTSretriever() = default;
     thermalAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }
@@ -217,6 +222,7 @@ class thermalAreaNumberOfTSretriever : public areaNumberOfTSretriever
 class renewClustersAreaNumberOfTSretriever : public areaNumberOfTSretriever
 {
 public:
+    virtual ~renewClustersAreaNumberOfTSretriever() = default;
     renewClustersAreaNumberOfTSretriever(Study& study) : areaNumberOfTSretriever(study)
     {
     }

diff --git a/src/solver/utils/mps_utils.h b/src/solver/utils/mps_utils.h
@@ -27,6 +27,7 @@ class I_MPS_writer
     {
     }
     I_MPS_writer() = default;
+    virtual ~I_MPS_writer() = default;
     virtual void runIfNeeded(Solver::IResultWriter& writer, const std::string& filename) = 0;
 
 protected:
@@ -46,6 +47,7 @@ class fullMPSwriter final : public I_MPS_writer
 class fullOrToolsMPSwriter : public I_MPS_writer
 {
 public:
+    virtual ~fullOrToolsMPSwriter() = default;
     fullOrToolsMPSwriter(MPSolver* solver, uint currentOptimNumber);
     void runIfNeeded(Solver::IResultWriter& writer, const std::string& filename) override;
 
@@ -56,6 +58,7 @@ class fullOrToolsMPSwriter : public I_MPS_writer
 class nullMPSwriter : public I_MPS_writer
 {
 public:
+    virtual ~nullMPSwriter() = default;
     using I_MPS_writer::I_MPS_writer;
     void runIfNeeded(Solver::IResultWriter& /*writer*/,
                      const std::string& /*filename*/) override
@@ -67,6 +70,7 @@ class nullMPSwriter : public I_MPS_writer
 class mpsWriterFactory
 {
 public:
+    virtual ~mpsWriterFactory() = default;
     mpsWriterFactory(Data::mpsExportStatus exportMPS,
                      bool exportMPSOnError,
                      const int current_optim_number,

diff --git a/src/solver/utils/name_translator.h b/src/solver/utils/name_translator.h
@@ -7,19 +7,26 @@
 class NameTranslator
 {
 public:
+    virtual ~NameTranslator() = default;
     virtual char** translate(const std::vector<std::string>& src,
                              std::vector<char*>& pointerVec) = 0;
     static std::unique_ptr<NameTranslator> create(bool useRealNames);
 };
 
 class RealName : public NameTranslator
 {
+public:
+    ~RealName() override = default;
+private:
     char** translate(const std::vector<std::string>& src,
                      std::vector<char*>& pointerVec) override;
 };
 
 class NullName : public NameTranslator
 {
+public:
+    ~NullName() override = default;
+private:
     char** translate(const std::vector<std::string>& src,
                      std::vector<char*>& pointerVec) override;
 };
diff --git a/src/solver/utils/named_problem.cpp b/src/solver/utils/named_problem.cpp
@@ -1,9 +1,7 @@
 #include "named_problem.h"
 #include <algorithm>
 
-namespace Antares
-{
-namespace Optimization
+namespace Antares::Optimization
 {
 
 PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(const std::vector<std::string>& NomDesVariables,
@@ -12,15 +10,15 @@ PROBLEME_SIMPLEXE_NOMME::PROBLEME_SIMPLEXE_NOMME(const std::vector<std::string>&
                                                  std::vector<int>& StatutDesVariables,
                                                  std::vector<int>& StatutDesContraintes,
                                                  bool UseNamedProblems,
-                                                 bool SolverLogs) :
+                                                 bool SolverLogs) : PROBLEME_SIMPLEXE(),
 
  NomDesVariables(NomDesVariables),
  NomDesContraintes(NomDesContraintes),
- VariablesEntieres(VariablesEntieres),
+ useNamedProblems_(UseNamedProblems),
+ solverLogs_(SolverLogs),
  StatutDesVariables(StatutDesVariables),
  StatutDesContraintes(StatutDesContraintes),
- useNamedProblems_(UseNamedProblems),
- solverLogs_(SolverLogs)
+ VariablesEntieres(VariablesEntieres)
 {
     AffichageDesTraces = SolverLogs ? OUI_SPX : NON_SPX;
 }
@@ -36,5 +34,4 @@ bool PROBLEME_SIMPLEXE_NOMME::basisExists() const
     return !StatutDesVariables.empty() && !StatutDesContraintes.empty();
 }
 
-} // namespace Optimization
-} // namespace Antares
+} // namespace Antares::Optimization