[Framework] Fix more warnings (msvc) (sofa-framework#6113)

fredroy · hugtalbot · web-flow · commit 2dd7c615be00 · 2026-06-05T13:17:55.000+02:00
* fix C4458 C4456 C4244 C4267 C4245 C4701 C4515  warnings

* fix warning C4244 C4189

* ignore warning 4589

* fix compilation error with clang

---------

Co-authored-by: Hugo &lt;hugo.talbot@sofa-framework.org&gt;
diff --git a/Sofa/framework/Config/CMakeLists.txt b/Sofa/framework/Config/CMakeLists.txt
@@ -181,6 +181,9 @@ endif()
 ## Windows-specific
 if(WIN32)
     list(APPEND SOFACONFIG_COMPILE_OPTIONS "/W4")
+    # MSVC warning suppressions
+    list(APPEND SOFACONFIG_COMPILE_OPTIONS "/wd4589") # Constructor of abstract class ignores initializer for virtual base class
+
     list(APPEND SOFACONFIG_COMPILE_OPTIONS "-D_USE_MATH_DEFINES")
     list(APPEND SOFACONFIG_COMPILE_OPTIONS "-D_CRT_SECURE_NO_WARNINGS")
     list(APPEND SOFACONFIG_COMPILE_OPTIONS "-D_CRT_NONSTDC_NO_DEPRECATE")
diff --git a/Sofa/framework/Core/src/sofa/core/CollisionElement.h b/Sofa/framework/Core/src/sofa/core/CollisionElement.h
@@ -59,7 +59,7 @@ class BaseCollisionElementIterator
     /// Constructor.
     /// This constructor should be used in case a vector of indices is used.
     BaseCollisionElementIterator(VIterator vit, VIterator vitend)
-        : index(-1), it(vit), itend(vitend)
+        : index(static_cast<Index>(-1)), it(vit), itend(vitend)
     {
         if (it != itend) index = *it;
     }
diff --git a/Sofa/framework/Core/src/sofa/core/ComponentLibrary.cpp b/Sofa/framework/Core/src/sofa/core/ComponentLibrary.cpp
@@ -29,7 +29,7 @@ namespace sofa::core
 std::string caseInsensitive(const std::string &text)
 {
     std::string result; result.resize(text.size());
-    for (unsigned int i=0; i<text.size(); ++i) result[i] = toupper(text[i]);
+    for (unsigned int i=0; i<text.size(); ++i) result[i] = static_cast<char>(toupper(text[i]));
     return result;
 }
 
diff --git a/Sofa/framework/Core/src/sofa/core/DataTracker.cpp b/Sofa/framework/Core/src/sofa/core/DataTracker.cpp
@@ -87,8 +87,8 @@ void DataTrackerDDGNode::cleanDirty(const core::ExecParams*)
 
 void DataTrackerDDGNode::updateAllInputsIfDirty()
 {
-    const DDGLinkContainer& inputs = DDGNode::getInputs();
-    for(const auto input : inputs)
+    const DDGLinkContainer& ddgInputs = DDGNode::getInputs();
+    for(const auto input : ddgInputs)
     {
         static_cast<core::objectmodel::BaseData*>(input)->updateIfDirty();
     }
diff --git a/Sofa/framework/Core/src/sofa/core/Mapping.cpp b/Sofa/framework/Core/src/sofa/core/Mapping.cpp
@@ -28,7 +28,6 @@ namespace sofa::core
 {
 
 using namespace sofa::defaulttype;
-using namespace core;
 
 template class SOFA_CORE_API Mapping< sofa::defaulttype::Vec1Types, sofa::defaulttype::Vec1Types >;
 template class SOFA_CORE_API Mapping< sofa::defaulttype::Vec1Types, sofa::defaulttype::Vec2Types >;
diff --git a/Sofa/framework/Core/src/sofa/core/Mapping.inl b/Sofa/framework/Core/src/sofa/core/Mapping.inl
@@ -135,12 +135,12 @@ sofa::linearalgebra::BaseMatrix* Mapping<In,Out>::createMappedMatrix(const behav
 template <class In, class Out>
 void Mapping<In,Out>::apply(const MechanicalParams* mparams, MultiVecCoordId outPos, ConstMultiVecCoordId inPos)
 {
-    State<In>* fromModel = this->fromModel.get();
-    State<Out>*  toModel = this->toModel.get();
-    if(fromModel && toModel)
+    State<In>* from = this->fromModel.get();
+    State<Out>*  to = this->toModel.get();
+    if(from && to)
     {
-        OutDataVecCoord* out = outPos[toModel].write();
-        const InDataVecCoord* in = inPos[fromModel].read();
+        OutDataVecCoord* out = outPos[to].write();
+        const InDataVecCoord* in = inPos[from].read();
         if(out && in)
         {
             this->apply(mparams, *out, *in);
@@ -151,12 +151,12 @@ void Mapping<In,Out>::apply(const MechanicalParams* mparams, MultiVecCoordId out
 template <class In, class Out>
 void Mapping<In,Out>::applyJ(const MechanicalParams* mparams, MultiVecDerivId outVel, ConstMultiVecDerivId inVel)
 {
-    State<In>* fromModel = this->fromModel.get();
-    State<Out>*  toModel = this->toModel.get();
-    if(fromModel && toModel)
+    State<In>* from = this->fromModel.get();
+    State<Out>*  to = this->toModel.get();
+    if(from && to)
     {
-        OutDataVecDeriv* out = outVel[toModel].write();
-        const InDataVecDeriv* in = inVel[fromModel].read();
+        OutDataVecDeriv* out = outVel[to].write();
+        const InDataVecDeriv* in = inVel[from].read();
         if(out && in)
         {
                 this->applyJ(mparams, *out, *in);
@@ -167,12 +167,12 @@ void Mapping<In,Out>::applyJ(const MechanicalParams* mparams, MultiVecDerivId ou
 template <class In, class Out>
 void Mapping<In,Out>::applyJT(const MechanicalParams *mparams, MultiVecDerivId inForce, ConstMultiVecDerivId outForce)
 {
-    State<In>* fromModel = this->fromModel.get();
-    State<Out>*  toModel = this->toModel.get();
-    if(fromModel && toModel)
+    State<In>* from = this->fromModel.get();
+    State<Out>*  to = this->toModel.get();
+    if(from && to)
     {
-        InDataVecDeriv* out = inForce[fromModel].write();
-        const OutDataVecDeriv* in = outForce[toModel].read();
+        InDataVecDeriv* out = inForce[from].write();
+        const OutDataVecDeriv* in = outForce[to].read();
         if(out && in)
         {
             this->applyJT(mparams, *out, *in);
@@ -184,12 +184,12 @@ void Mapping<In,Out>::applyJT(const MechanicalParams *mparams, MultiVecDerivId i
 template <class In, class Out>
 void Mapping<In,Out>::applyJT(const ConstraintParams* cparams, MultiMatrixDerivId inConst, ConstMultiMatrixDerivId outConst )
 {
-    State<In>* fromModel = this->fromModel.get();
-    State<Out>*  toModel = this->toModel.get();
-    if(fromModel && toModel)
+    State<In>* from = this->fromModel.get();
+    State<Out>*  to = this->toModel.get();
+    if(from && to)
     {
-        InDataMatrixDeriv* out = inConst[fromModel].write();
-        const OutDataMatrixDeriv* in = outConst[toModel].read();
+        InDataMatrixDeriv* out = inConst[from].write();
+        const OutDataMatrixDeriv* in = outConst[to].read();
         if(out && in)
         {
             this->applyJT(cparams, *out, *in);
@@ -208,13 +208,13 @@ void Mapping<In,Out>::applyDJT(const MechanicalParams* /*mparams */ , MultiVecDe
 template <class In, class Out>
 void Mapping<In,Out>::computeAccFromMapping(const MechanicalParams* mparams, MultiVecDerivId outAcc, ConstMultiVecDerivId inVel, ConstMultiVecDerivId inAcc )
 {
-    State<In>* fromModel = this->fromModel.get();
-    State<Out>*  toModel = this->toModel.get();
-    if(fromModel && toModel)
+    State<In>* from = this->fromModel.get();
+    State<Out>*  to = this->toModel.get();
+    if(from && to)
     {
-        OutDataVecDeriv* out = outAcc[toModel].write();
-        const InDataVecDeriv* inV = inVel[fromModel].read();
-        const InDataVecDeriv* inA = inAcc[fromModel].read();
+        OutDataVecDeriv* out = outAcc[to].write();
+        const InDataVecDeriv* inV = inVel[from].read();
+        const InDataVecDeriv* inA = inAcc[from].read();
         if(out && inV && inA)
             this->computeAccFromMapping(mparams, *out, *inV, *inA);
     }
diff --git a/Sofa/framework/Core/src/sofa/core/ObjectFactory.cpp b/Sofa/framework/Core/src/sofa/core/ObjectFactory.cpp
@@ -529,7 +529,7 @@ void ObjectFactory::dump(std::ostream& out)
         if (!entry->aliases.empty())
         {
             out << "  aliases :";
-            for (std::set<std::string>::iterator myit = entry->aliases.begin(), itend = entry->aliases.end(); myit != itend; ++myit)
+            for (std::set<std::string>::iterator myit = entry->aliases.begin(), aliasesEnd = entry->aliases.end(); myit != aliasesEnd; ++myit)
                 out << " " << *myit;
             out << "\n";
         }
@@ -573,7 +573,7 @@ void ObjectFactory::dumpXML(std::ostream& out)
         const ClassEntry::SPtr entry = it->second;
         if (entry->className != it->first) continue;
         out << "<class name=\"" << xmlencode(entry->className) <<"\">\n";
-        for (std::set<std::string>::iterator myit = entry->aliases.begin(), itend = entry->aliases.end(); myit != itend; ++myit)
+        for (std::set<std::string>::iterator myit = entry->aliases.begin(), aliasesEnd = entry->aliases.end(); myit != aliasesEnd; ++myit)
             out << "<alias>" << xmlencode(*myit) << "</alias>\n";
         if (!entry->description.empty())
             out << "<description>"<<entry->description<<"</description>\n";
@@ -607,7 +607,7 @@ void ObjectFactory::dumpHTML(std::ostream& out)
         if (!entry->aliases.empty())
         {
             out << "<li>Aliases:<i>";
-            for (std::set<std::string>::iterator myit = entry->aliases.begin(), itend = entry->aliases.end(); myit != itend; ++myit)
+            for (std::set<std::string>::iterator myit = entry->aliases.begin(), aliasesEnd = entry->aliases.end(); myit != aliasesEnd; ++myit)
                 out << " " << xmlencode(*myit);
             out << "</i></li>\n";
         }
diff --git a/Sofa/framework/Core/src/sofa/core/SofaLibrary.cpp b/Sofa/framework/Core/src/sofa/core/SofaLibrary.cpp
@@ -48,9 +48,9 @@ void SofaLibrary::build( const std::vector< std::string >& examples)
         if (creatorEntry != entries[i]->creatorMap.end())
         {
             const objectmodel::BaseClass* baseClass = creatorEntry->second->getClass();
-            std::vector<std::string> categories;
-            CategoryLibrary::getCategories(baseClass, categories);
-            for (std::vector<std::string>::iterator it = categories.begin(); it != categories.end(); ++it)
+            std::vector<std::string> categoriesVec;
+            CategoryLibrary::getCategories(baseClass, categoriesVec);
+            for (std::vector<std::string>::iterator it = categoriesVec.begin(); it != categoriesVec.end(); ++it)
             {
                 mainCategories.insert((*it));
                 inventory.insert(std::make_pair((*it), entries[i]));
diff --git a/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp b/Sofa/framework/Core/src/sofa/core/behavior/DefaultMultiMatrixAccessor.cpp
@@ -52,7 +52,7 @@ void DefaultMultiMatrixAccessor::clear()
 {
     globalDim = 0;
     for (auto it = realStateOffsets.begin(), itend = realStateOffsets.end(); it != itend; ++it)
-        it->second = -1;
+        it->second = static_cast<decltype(it->second)>(-1);
 
     for (std::map< const sofa::core::behavior::BaseMechanicalState*, linearalgebra::BaseMatrix* >::iterator it = mappedMatrices.begin(), itend = mappedMatrices.end(); it != itend; ++it)
         if (it->second != nullptr) delete it->second;
diff --git a/Sofa/framework/Core/src/sofa/core/collision/Intersection.cpp b/Sofa/framework/Core/src/sofa/core/collision/Intersection.cpp
@@ -42,11 +42,11 @@ helper::TypeInfo IntersectorMap::getType(core::CollisionModel* model)
     if (it == castMap.end())
     {
         helper::TypeInfo t2 = t;
-        for (std::set<const objectmodel::ClassInfo* >::iterator it = classes.begin(); it != classes.end(); ++it)
+        for (std::set<const objectmodel::ClassInfo* >::iterator ci = classes.begin(); ci != classes.end(); ++ci)
         {
-            if ((*it)->isInstance(model))
+            if ((*ci)->isInstance(model))
             {
-                t2 = (*it)->type();
+                t2 = (*ci)->type();
                 break;
             }
         }
@@ -76,14 +76,14 @@ ElementIntersector* IntersectorMap::get(core::CollisionModel* model1, core::Coll
 
 
     std::stringstream tmp;
-    for(InternalMap::const_iterator it = intersectorsMap.begin(), itEnd = intersectorsMap.end(); it != itEnd; ++it)
+    for(InternalMap::const_iterator it2 = intersectorsMap.begin(), itEnd = intersectorsMap.end(); it2 != itEnd; ++it2)
     {
-        helper::TypeInfo t1 = it->first.first;
-        helper::TypeInfo t2 = it->first.second;
+        helper::TypeInfo t1_tmp = it2->first.first;
+        helper::TypeInfo t2_tmp = it2->first.second;
         tmp << "  "
-                << gettypename(t1) << "-"
-                << gettypename(t2);
-        const ElementIntersector* i = it->second;
+                << gettypename(t1_tmp) << "-"
+                << gettypename(t2_tmp);
+        const ElementIntersector* i = it2->second;
         if (!i)
             tmp << "  nullptr";
         else
diff --git a/Sofa/framework/Core/src/sofa/core/loader/VoxelLoader.cpp b/Sofa/framework/Core/src/sofa/core/loader/VoxelLoader.cpp
@@ -35,7 +35,6 @@ namespace sofa::core::loader
 {
 
 using namespace sofa::defaulttype;
-using namespace sofa::core::loader;
 
 VoxelLoader::VoxelLoader()
     :BaseLoader()
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseComponent.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseComponent.cpp
@@ -209,11 +209,11 @@ const BaseComponent::VecSlaves& BaseComponent::getSlaves() const
     return l_slaves.getValue();
 }
 
-BaseComponent* BaseComponent::getSlave(const std::string& name) const
+BaseComponent* BaseComponent::getSlave(const std::string& slaveName) const
 {
     for (auto slave : l_slaves)
     {
-        if (slave.get() && slave->getName() == name)
+        if (slave.get() && slave->getName() == slaveName)
             return slave.get();
     }
     return nullptr;
diff --git a/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp b/Sofa/framework/Core/src/sofa/core/objectmodel/BaseLink.cpp
@@ -316,9 +316,9 @@ bool BaseLink::read( const std::string& str )
 
     /// Add the detected objects that are not already present to the container of this Link
     clear();
-    for (const auto& [base, path] : entries)
+    for (const auto& [base, linkPath] : entries)
     {
-        ok = add(base, path) && ok;
+        ok = add(base, linkPath) && ok;
     }
     return ok;
 }
diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/NameOnlyTypeInfo.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/NameOnlyTypeInfo.h
@@ -78,16 +78,16 @@ class SOFA_DEFAULTTYPE_API NameOnlyTypeInfo : public AbstractTypeInfo
     /// and those six elements are conceptually numbered from 0 to 5.  This is
     /// relevant only if FixedSize() is true. I FixedSize() is false,
     /// the return value will be equivalent to the one of byteSize()
-    sofa::Size size() const override {return -1;}
+    sofa::Size size() const override {return static_cast<sofa::Size>(-1);}
     /// The size in bytes of the ValueType
     /// For example, the size of a fixed_array<fixed_array<int, 2>, 3>` is 4 on most systems,
     /// as it is the byte size of the smallest dimension in the array (int -> 32bit)
-    sofa::Size byteSize() const override {return -1;}
+    sofa::Size byteSize() const override {return static_cast<sofa::Size>(-1);}
 
     /// The size of \a data, in number of iterable elements
     /// (For containers, that'll be the number of elements in the 1st dimension).
     /// For example, with type == `
-    sofa::Size size(const void* /*data*/) const override {return -1;}
+    sofa::Size size(const void* /*data*/) const override {return static_cast<sofa::Size>(-1);}
     /// Resize \a data to \a size elements, if relevant.
 
     /// But resizing is not always relevant, for example:
diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/NoTypeInfo.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/NoTypeInfo.h
@@ -74,16 +74,16 @@ class SOFA_DEFAULTTYPE_API NoTypeInfo : public AbstractTypeInfo
     /// and those six elements are conceptually numbered from 0 to 5.  This is
     /// relevant only if FixedSize() is true. I FixedSize() is false,
     /// the return value will be equivalent to the one of byteSize()
-    sofa::Size size() const override {return -1;}
+    sofa::Size size() const override {return static_cast<sofa::Size>(-1);}
     /// The size in bytes of the ValueType
     /// For example, the size of a fixed_array<fixed_array<int, 2>, 3>` is 4 on most systems,
     /// as it is the byte size of the smallest dimension in the array (int -> 32bit)
-    sofa::Size byteSize() const override {return -1;}
+    sofa::Size byteSize() const override {return static_cast<sofa::Size>(-1);}
 
     /// The size of \a data, in number of iterable elements
     /// (For containers, that'll be the number of elements in the 1st dimension).
     /// For example, with type == `
-    sofa::Size size(const void* /*data*/) const override {return -1;}
+    sofa::Size size(const void* /*data*/) const override {return static_cast<sofa::Size>(-1);}
     /// Resize \a data to \a size elements, if relevant.
 
     /// But resizing is not always relevant, for example:
diff --git a/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/FixedArrayTypeInfo.h b/Sofa/framework/DefaultType/src/sofa/defaulttype/typeinfo/models/FixedArrayTypeInfo.h
@@ -80,7 +80,7 @@ struct FixedArrayTypeInfo
     {
         if constexpr (!FixedSize)
         {
-            size /= data.size();
+            size /= static_cast<sofa::Size>(data.size());
             for (sofa::Size i = 0; i < data.size(); ++i)
             {
                 if (!BaseTypeInfo::setSize(data[(sofa::Size)i], size)) 
diff --git a/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.cpp b/Sofa/framework/Helper/src/sofa/helper/AdvancedTimer.cpp
@@ -934,7 +934,7 @@ void TimerData::print()
 AdvancedTimer::outputType AdvancedTimer::convertOutputType(std::string type)
 {
 	std::for_each(type.begin(), type.end(),  [](char& c) {
-		c = std::tolower(static_cast<unsigned char>(c)); } );
+		c = static_cast<char>(std::tolower(static_cast<unsigned char>(c))); } );
 
 	if(type.compare("json") == 0)
 		return JSON;
diff --git a/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp b/Sofa/framework/Helper/src/sofa/helper/DiffLib.cpp
@@ -36,10 +36,10 @@ std::vector<std::tuple<std::string, SReal>> SOFA_HELPER_API getClosestMatch(cons
     class Tuple
     {
     public:
-        Tuple(float ratio_, std::string value_)
+        Tuple(SReal ratio_, std::string value_)
             : ratio(ratio_), value(std::move(value_)) {}
 
-        float ratio;
+        SReal ratio;
         std::string value;
     };
     auto cmp = [](const Tuple& left, Tuple& right) { return left.ratio < right.ratio; };
diff --git a/Sofa/framework/Helper/src/sofa/helper/LCPcalc.cpp b/Sofa/framework/Helper/src/sofa/helper/LCPcalc.cpp
@@ -113,15 +113,15 @@ void LCP::setLCP(unsigned int input_dim, SReal *input_dfree, SReal **input_W, SR
 void LCP::solveNLCP(bool convergenceTest, std::vector<SReal>* residuals, std::vector<SReal>* violations)
 {
     //SReal error;
-    SReal f_1[3],dn, ds, dt;
+    SReal f_1_local[3],dn, ds, dt;
     const int numContacts = dim/3;
     const bool computeError = (convergenceTest || residuals);
     for (it=0; it<numItMax; it++)
     {
         error = 0;
         for (int c=0;  c<numContacts ; c++)
         {
-            f_1[0] = f[3*c]; f_1[1] = f[3*c+1]; f_1[2] = f[3*c+2];
+            f_1_local[0] = f[3*c]; f_1_local[1] = f[3*c+1]; f_1_local[2] = f[3*c+2];
             dn =dfree[3*c];  dt=dfree[3*c+1]; ds =dfree[3*c+2];
             for (int i=0; i<dim; i++)
             {
@@ -140,14 +140,14 @@ void LCP::solveNLCP(bool convergenceTest, std::vector<SReal>* residuals, std::ve
             if (f[3*c]<0)
             {
 
-                if (f_1[0]>0 && computeError)  // the point was in contact and is no more in contact..
+                if (f_1_local[0]>0 && computeError)  // the point was in contact and is no more in contact..
                 {
 
                     for (int j=0; j<3; j++ )
                     {
-                        Ddn -= W[3*c  ][3*c+j]*f_1[j];
-                        Ddt -= W[3*c+1][3*c+j]*f_1[j];
-                        Dds -= W[3*c+2][3*c+j]*f_1[j];
+                        Ddn -= W[3*c  ][3*c+j]*f_1_local[j];
+                        Ddt -= W[3*c+1][3*c+j]*f_1_local[j];
+                        Dds -= W[3*c+2][3*c+j]*f_1_local[j];
                     }
                     error += sqrt(Ddn*Ddn + Ddt*Ddt + Dds*Dds);
                 }
@@ -161,8 +161,8 @@ void LCP::solveNLCP(bool convergenceTest, std::vector<SReal>* residuals, std::ve
             ////// FRICTION
 
             // evaluation of the current tangent positions (motion du to force change along normal)
-            dt +=  W[3*c+1][3*c]*(f[3*c]-f_1[0]);
-            ds +=  W[3*c+2][3*c]*(f[3*c]-f_1[0]);
+            dt +=  W[3*c+1][3*c]*(f[3*c]-f_1_local[0]);
+            ds +=  W[3*c+2][3*c]*(f[3*c]-f_1_local[0]);
 
             // envaluation of the new fricton forces
 
diff --git a/Sofa/framework/Helper/src/sofa/helper/TriangleOctree.cpp b/Sofa/framework/Helper/src/sofa/helper/TriangleOctree.cpp
@@ -840,7 +840,7 @@ void TriangleOctreeRoot::buildOctree()
     // for each triangle add it to the octree
     for (size_t i = 0; i < octreeTriangles->size(); i++)
     {
-        fillOctree (static_cast<int>(i));
+        fillOctree(static_cast<Index>(i));
     }
 }
 
diff --git a/Sofa/framework/Helper/src/sofa/helper/io/ImageDDS.cpp b/Sofa/framework/Helper/src/sofa/helper/io/ImageDDS.cpp
diff --git a/Sofa/framework/Helper/src/sofa/helper/system/DynamicLibrary.cpp b/Sofa/framework/Helper/src/sofa/helper/system/DynamicLibrary.cpp
diff --git a/Sofa/framework/Helper/src/sofa/helper/system/SetDirectory.cpp b/Sofa/framework/Helper/src/sofa/helper/system/SetDirectory.cpp
diff --git a/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h b/Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixGeneric.h
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/RequiredPlugin.cpp
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/VectorOperations.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/VectorOperations.cpp
diff --git a/Sofa/framework/Simulation/Core/src/sofa/simulation/task/WorkerThread.cpp b/Sofa/framework/Simulation/Core/src/sofa/simulation/task/WorkerThread.cpp

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class BaseCollisionElementIterator`
`59`	`59`	`/// Constructor.`
`60`	`60`	`/// This constructor should be used in case a vector of indices is used.`
`61`	`61`	`BaseCollisionElementIterator(VIterator vit, VIterator vitend)`
`62`		`- : index(-1), it(vit), itend(vitend)`
	`62`	`+ : index(static_cast<Index>(-1)), it(vit), itend(vitend)`
`63`	`63`	`{`
`64`	`64`	`if (it != itend) index = *it;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace sofa::core`
`29`	`29`	`std::string caseInsensitive(const std::string &text)`
`30`	`30`	`{`
`31`	`31`	`std::string result; result.resize(text.size());`
`32`		`- for (unsigned int i=0; i<text.size(); ++i) result[i] = toupper(text[i]);`
	`32`	`+ for (unsigned int i=0; i<text.size(); ++i) result[i] = static_cast<char>(toupper(text[i]));`
`33`	`33`	`return result;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,8 @@ void DataTrackerDDGNode::cleanDirty(const core::ExecParams*)`
`87`	`87`
`88`	`88`	`void DataTrackerDDGNode::updateAllInputsIfDirty()`
`89`	`89`	`{`
`90`		`- const DDGLinkContainer& inputs = DDGNode::getInputs();`
`91`		`- for(const auto input : inputs)`
	`90`	`+ const DDGLinkContainer& ddgInputs = DDGNode::getInputs();`
	`91`	`+ for(const auto input : ddgInputs)`
`92`	`92`	`{`
`93`	`93`	`static_cast<core::objectmodel::BaseData*>(input)->updateIfDirty();`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ namespace sofa::core`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`using namespace sofa::defaulttype;`
`31`		`-using namespace core;`
`32`	`31`
`33`	`32`	`template class SOFA_CORE_API Mapping< sofa::defaulttype::Vec1Types, sofa::defaulttype::Vec1Types >;`
`34`	`33`	`template class SOFA_CORE_API Mapping< sofa::defaulttype::Vec1Types, sofa::defaulttype::Vec2Types >;`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ void SofaLibrary::build( const std::vector< std::string >& examples)`
`48`	`48`	`if (creatorEntry != entries[i]->creatorMap.end())`
`49`	`49`	`{`
`50`	`50`	`const objectmodel::BaseClass* baseClass = creatorEntry->second->getClass();`
`51`		`- std::vector<std::string> categories;`
`52`		`- CategoryLibrary::getCategories(baseClass, categories);`
`53`		`- for (std::vector<std::string>::iterator it = categories.begin(); it != categories.end(); ++it)`
	`51`	`+ std::vector<std::string> categoriesVec;`
	`52`	`+ CategoryLibrary::getCategories(baseClass, categoriesVec);`
	`53`	`+ for (std::vector<std::string>::iterator it = categoriesVec.begin(); it != categoriesVec.end(); ++it)`
`54`	`54`	`{`
`55`	`55`	`mainCategories.insert((*it));`
`56`	`56`	`inventory.insert(std::make_pair((*it), entries[i]));`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ void DefaultMultiMatrixAccessor::clear()`
`52`	`52`	`{`
`53`	`53`	`globalDim = 0;`
`54`	`54`	`for (auto it = realStateOffsets.begin(), itend = realStateOffsets.end(); it != itend; ++it)`
`55`		`- it->second = -1;`
	`55`	`+ it->second = static_cast<decltype(it->second)>(-1);`
`56`	`56`
`57`	`57`	`for (std::map< const sofa::core::behavior::BaseMechanicalState, linearalgebra::BaseMatrix >::iterator it = mappedMatrices.begin(), itend = mappedMatrices.end(); it != itend; ++it)`
`58`	`58`	`if (it->second != nullptr) delete it->second;`
Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,11 @@ helper::TypeInfo IntersectorMap::getType(core::CollisionModel* model)`
`42`	`42`	`if (it == castMap.end())`
`43`	`43`	`{`
`44`	`44`	`helper::TypeInfo t2 = t;`
`45`		`- for (std::set<const objectmodel::ClassInfo* >::iterator it = classes.begin(); it != classes.end(); ++it)`
	`45`	`+ for (std::set<const objectmodel::ClassInfo* >::iterator ci = classes.begin(); ci != classes.end(); ++ci)`
`46`	`46`	`{`
`47`		`- if ((*it)->isInstance(model))`
	`47`	`+ if ((*ci)->isInstance(model))`
`48`	`48`	`{`
`49`		`- t2 = (*it)->type();`
	`49`	`+ t2 = (*ci)->type();`
`50`	`50`	`break;`
`51`	`51`	`}`
`52`	`52`	`}`
`@@ -76,14 +76,14 @@ ElementIntersector* IntersectorMap::get(core::CollisionModel* model1, core::Coll`
`76`	`76`
`77`	`77`
`78`	`78`	`std::stringstream tmp;`
`79`		`- for(InternalMap::const_iterator it = intersectorsMap.begin(), itEnd = intersectorsMap.end(); it != itEnd; ++it)`
	`79`	`+ for(InternalMap::const_iterator it2 = intersectorsMap.begin(), itEnd = intersectorsMap.end(); it2 != itEnd; ++it2)`
`80`	`80`	`{`
`81`		`- helper::TypeInfo t1 = it->first.first;`
`82`		`- helper::TypeInfo t2 = it->first.second;`
	`81`	`+ helper::TypeInfo t1_tmp = it2->first.first;`
	`82`	`+ helper::TypeInfo t2_tmp = it2->first.second;`
`83`	`83`	`tmp << " "`
`84`		`- << gettypename(t1) << "-"`
`85`		`- << gettypename(t2);`
`86`		`- const ElementIntersector* i = it->second;`
	`84`	`+ << gettypename(t1_tmp) << "-"`
	`85`	`+ << gettypename(t2_tmp);`
	`86`	`+ const ElementIntersector* i = it2->second;`
`87`	`87`	`if (!i)`
`88`	`88`	`tmp << " nullptr";`
`89`	`89`	`else`