Skip to content

Commit 9de2f31

Browse files
fredroyhugtalbotepernod
authored
[Framework] Remove shadow warnings (#5692)
remove shadow warning in Sofa.Framework Co-authored-by: Hugo <hugo.talbot@sofa-framework.org> Co-authored-by: erik pernod <erik.pernod@gmail.com>
1 parent 4057a76 commit 9de2f31

File tree

66 files changed

+357
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+357
-357
lines changed

‎Sofa/Component/Playback/src/sofa/component/playback/WriteTopology.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ void registerWriteTopology(sofa::core::ObjectFactory* factory)
3535
.add< WriteTopology >());
3636
}
3737

38-
WriteTopologyCreator::WriteTopologyCreator(const core::ExecParams* params)
39-
:Visitor(params)
38+
WriteTopologyCreator::WriteTopologyCreator(const core::ExecParams* eparams)
39+
:Visitor(eparams)
4040
,sceneName("")
4141
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
4242
, extension(".txt.gz")
@@ -50,8 +50,8 @@ WriteTopologyCreator::WriteTopologyCreator(const core::ExecParams* params)
5050
{
5151
}
5252

53-
WriteTopologyCreator::WriteTopologyCreator(const std::string &n, bool _writeContainers, bool _writeShellContainers, bool _createInMapping, const core::ExecParams* params, int c)
54-
:Visitor(params)
53+
WriteTopologyCreator::WriteTopologyCreator(const std::string &n, bool _writeContainers, bool _writeShellContainers, bool _createInMapping, const core::ExecParams* eparams, int c)
54+
:Visitor(eparams)
5555
, sceneName(n)
5656
#if SOFA_COMPONENT_PLAYBACK_HAVE_ZLIB
5757
, extension(".txt.gz")

‎Sofa/framework/Core/src/sofa/core/CollisionElement.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,22 @@ class BaseCollisionElementIterator
4444
/// In most cases it will be used by the CollisionModel to
4545
/// create interators to its elements (such as in the begin() and end()
4646
/// methods).
47-
BaseCollisionElementIterator(Index index=0)
48-
: index(index), it(emptyVector.begin()), itend(emptyVector.end())
47+
BaseCollisionElementIterator(Index cindex=0)
48+
: index(cindex), it(emptyVector.begin()), itend(emptyVector.end())
4949
{
5050
}
5151

5252
/// Constructor.
5353
/// This constructor should be used in case a vector of indices is used.
54-
BaseCollisionElementIterator(Index index, VIterator it, VIterator itend)
55-
: index(index), it(it), itend(itend)
54+
BaseCollisionElementIterator(Index cindex, VIterator vit, VIterator vitend)
55+
: index(cindex), it(vit), itend(vitend)
5656
{
5757
}
5858

5959
/// Constructor.
6060
/// This constructor should be used in case a vector of indices is used.
61-
BaseCollisionElementIterator(VIterator it, VIterator itend)
62-
: index(-1), it(it), itend(itend)
61+
BaseCollisionElementIterator(VIterator vit, VIterator vitend)
62+
: index(-1), it(vit), itend(vitend)
6363
{
6464
if (it != itend) index = *it;
6565
}
@@ -165,22 +165,22 @@ class TCollisionElementIterator : public BaseCollisionElementIterator
165165
/// In most cases it will be used by the CollisionModel to
166166
/// create interators to its elements (such as in the begin() and end()
167167
/// methods).
168-
TCollisionElementIterator(Model* model=nullptr, Index index=0)
169-
: BaseCollisionElementIterator(index), model(model)
168+
TCollisionElementIterator(Model* cmodel=nullptr, Index cindex=0)
169+
: BaseCollisionElementIterator(cindex), model(cmodel)
170170
{
171171
}
172172

173173
/// Constructor.
174174
/// This constructor should be used in case a vector of indices is used.
175-
TCollisionElementIterator(Model* model, Index index, VIterator it, VIterator itend)
176-
: BaseCollisionElementIterator(index, it, itend), model(model)
175+
TCollisionElementIterator(Model* cmodel, Index cindex, VIterator vit, VIterator vitend)
176+
: BaseCollisionElementIterator(cindex, vit, vitend), model(cmodel)
177177
{
178178
}
179179

180180
/// Constructor.
181181
/// This constructor should be used in case a vector of indices is used.
182-
TCollisionElementIterator(Model* model, VIterator it, VIterator itend)
183-
: BaseCollisionElementIterator(it, itend), model(model)
182+
TCollisionElementIterator(Model* cmodel, VIterator vit, VIterator vitend)
183+
: BaseCollisionElementIterator(vit, vitend), model(cmodel)
184184
{
185185
}
186186

@@ -310,22 +310,22 @@ class CollisionElementIterator : public TCollisionElementIterator<CollisionModel
310310
/// In most cases it will be used by the CollisionModel to
311311
/// create interators to its elements (such as in the begin() and end()
312312
/// methods).
313-
CollisionElementIterator(CollisionModel* model=nullptr, Index index=0)
314-
: TCollisionElementIterator<CollisionModel>(model, index)
313+
CollisionElementIterator(CollisionModel* cmodel=nullptr, Index cindex=0)
314+
: TCollisionElementIterator<CollisionModel>(cmodel, cindex)
315315
{
316316
}
317317

318318
/// Constructor.
319319
/// This constructor should be used in case a vector of indices is used.
320-
CollisionElementIterator(CollisionModel* model, VIterator it, VIterator itend)
321-
: TCollisionElementIterator<CollisionModel>(model, it, itend)
320+
CollisionElementIterator(CollisionModel* cmodel, VIterator vit, VIterator vitend)
321+
: TCollisionElementIterator<CollisionModel>(cmodel, vit, vitend)
322322
{
323323
}
324324

325325
/// Constructor.
326326
/// This constructor should be used in case a vector of indices is used.
327-
CollisionElementIterator(CollisionModel* model, Index index, VIterator it, VIterator itend)
328-
: TCollisionElementIterator<CollisionModel>(model, index, it, itend)
327+
CollisionElementIterator(CollisionModel* cmodel, Index cindex, VIterator vit, VIterator vitend)
328+
: TCollisionElementIterator<CollisionModel>(cmodel, cindex, vit, vitend)
329329
{
330330
}
331331

‎Sofa/framework/Core/src/sofa/core/MultiVecId.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ struct StateVecAccessor<DataTypes, V_COORD, V_READ>
4646
typedef TVecId<V_COORD, V_READ> MyVecId;
4747
typedef Data<typename DataTypes::VecCoord> MyDataVec;
4848

49-
StateVecAccessor(const State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
49+
StateVecAccessor(const State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
5050
operator MyVecId() const { return id; }
5151
const MyDataVec* read() const { return state-> read(id); }
5252

@@ -61,7 +61,7 @@ struct StateVecAccessor<DataTypes, V_COORD, V_WRITE>
6161
typedef TVecId<V_COORD, V_WRITE> MyVecId;
6262
typedef Data<typename DataTypes::VecCoord> MyDataVec;
6363

64-
StateVecAccessor(State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
64+
StateVecAccessor(State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
6565
operator MyVecId() const { return id; }
6666
const MyDataVec* read() const { return state-> read(id); }
6767
MyDataVec* write() const { return state->write(id); }
@@ -77,7 +77,7 @@ struct StateVecAccessor<DataTypes, V_DERIV, V_READ>
7777
typedef TVecId<V_DERIV, V_READ> MyVecId;
7878
typedef Data<typename DataTypes::VecDeriv> MyDataVec;
7979

80-
StateVecAccessor(const State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
80+
StateVecAccessor(const State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
8181
operator MyVecId() const { return id; }
8282
const MyDataVec* read() const { return state-> read(id); }
8383

@@ -92,7 +92,7 @@ struct StateVecAccessor<DataTypes, V_DERIV, V_WRITE>
9292
typedef TVecId<V_DERIV, V_WRITE> MyVecId;
9393
typedef Data<typename DataTypes::VecDeriv> MyDataVec;
9494

95-
StateVecAccessor(State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
95+
StateVecAccessor(State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
9696
operator MyVecId() const { return id; }
9797
const MyDataVec* read() const { return state-> read(id); }
9898
MyDataVec* write() const { return state->write(id); }
@@ -108,7 +108,7 @@ struct StateVecAccessor<DataTypes, V_MATDERIV, V_READ>
108108
typedef TVecId<V_MATDERIV, V_READ> MyVecId;
109109
typedef Data<typename DataTypes::MatrixDeriv> MyDataVec;
110110

111-
StateVecAccessor(const State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
111+
StateVecAccessor(const State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
112112
operator MyVecId() const { return id; }
113113
const MyDataVec* read() const { return state-> read(id); }
114114

@@ -123,7 +123,7 @@ struct StateVecAccessor<DataTypes, V_MATDERIV, V_WRITE>
123123
typedef TVecId<V_MATDERIV, V_WRITE> MyVecId;
124124
typedef Data<typename DataTypes::MatrixDeriv> MyDataVec;
125125

126-
StateVecAccessor(State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
126+
StateVecAccessor(State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
127127
operator MyVecId() const { return id; }
128128
const MyDataVec* read() const { return state-> read(id); }
129129
MyDataVec* write() const { return state->write(id); }
@@ -139,7 +139,7 @@ struct StateVecAccessor<DataTypes, V_ALL, V_READ>
139139
typedef TVecId<V_ALL, V_READ> MyVecId;
140140
//typedef BaseData MyDataVec;
141141

142-
StateVecAccessor(const State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
142+
StateVecAccessor(const State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
143143
operator MyVecId() const { return id; }
144144
//const MyDataVec* read() const { return state-> read(id); }
145145

@@ -153,7 +153,7 @@ struct StateVecAccessor<DataTypes, V_ALL, V_WRITE>
153153
{
154154
typedef TVecId<V_ALL, V_WRITE> MyVecId;
155155

156-
StateVecAccessor(State<DataTypes>* state, const MyVecId& id) : state(state), id(id) {}
156+
StateVecAccessor(State<DataTypes>* st, const MyVecId& vecid) : state(st), id(vecid) {}
157157
operator MyVecId() const { return id; }
158158

159159
protected:

‎Sofa/framework/Core/src/sofa/core/behavior/BaseVectorOperations.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ class BaseVectorOperations
3636
SReal result;
3737

3838
public:
39-
BaseVectorOperations(const core::ExecParams* params, core::objectmodel::BaseContext* ctx)
40-
: params(params),ctx(ctx)
39+
BaseVectorOperations(const core::ExecParams* eparams, core::objectmodel::BaseContext* context)
40+
: params(eparams),ctx(context)
4141
{}
4242

4343
virtual ~BaseVectorOperations()

‎Sofa/framework/Core/src/sofa/core/behavior/MultiVec.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ class TMultiVec
5656
public:
5757

5858
/// Refers to a state vector with the given ID (VecId::position(), VecId::velocity(), etc).
59-
TMultiVec( BaseVectorOperations* vop, MyMultiVecId v) : vop(vop), v(v), dynamic(false)
59+
TMultiVec( BaseVectorOperations* bvop, MyMultiVecId mvecid) : vop(bvop), v(mvecid), dynamic(false)
6060
{}
6161

6262
/// Refers to a not yet allocated state vector
6363
TMultiVec() : vop(nullptr), v(MyMultiVecId::null()), dynamic(false)
6464
{}
6565

6666
/// Allocate a new temporary vector with the given type (sofa::core::V_COORD or sofa::core::V_DERIV).
67-
TMultiVec( BaseVectorOperations* vop, bool dynamic=true, const VecIdProperties& properties = {}) : vop(vop), v(MyMultiVecId::null()), dynamic(dynamic)
67+
TMultiVec( BaseVectorOperations* bvop, bool bdynamic=true, const VecIdProperties& properties = {}) : vop(bvop), v(MyMultiVecId::null()), dynamic(bdynamic)
6868
{
6969
static_assert(vtype == V_COORD || vtype == V_DERIV, "");
7070
vop->v_alloc( v, properties);

0 commit comments

Comments
 (0)