Skip to content

Commit 8247247

Browse files
ericmehlericmehl
committed
Fix MSVC warning C4456 (declaration hides previous declaration)
1 parent 8905f77 commit 8247247

File tree

8 files changed

+132
-132
lines changed

8 files changed

+132
-132
lines changed

‎contrib/IECoreAlembic/src/IECoreAlembic/AlembicScene.cpp‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,196 +1572,196 @@ class AlembicScene::AlembicWriter : public AlembicIO
15721572
return;
15731573
}
15741574

1575-
if( const IECore::BoolData *data = runTimeCast<const IECore::BoolData>( attribute ) )
1575+
if( const IECore::BoolData *bData = runTimeCast<const IECore::BoolData>( attribute ) )
15761576
{
1577-
setProperty<OBoolProperty>( name, time, data );
1577+
setProperty<OBoolProperty>( name, time, bData );
15781578
}
1579-
else if( const IECore::UCharData *data = runTimeCast<const IECore::UCharData>( attribute ) )
1579+
else if( const IECore::UCharData *ucData = runTimeCast<const IECore::UCharData>( attribute ) )
15801580
{
1581-
setProperty<OUcharProperty>( name, time, data );
1581+
setProperty<OUcharProperty>( name, time, ucData );
15821582
}
1583-
else if( const IECore::CharData *data = runTimeCast<const IECore::CharData>( attribute ) )
1583+
else if( const IECore::CharData *cData = runTimeCast<const IECore::CharData>( attribute ) )
15841584
{
1585-
setProperty<OCharProperty>( name, time, data );
1585+
setProperty<OCharProperty>( name, time, cData );
15861586
}
1587-
else if( const IECore::UShortData *data = runTimeCast<const IECore::UShortData>( attribute ) )
1587+
else if( const IECore::UShortData *usData = runTimeCast<const IECore::UShortData>( attribute ) )
15881588
{
1589-
setProperty<OUInt16Property>( name, time, data );
1589+
setProperty<OUInt16Property>( name, time, usData );
15901590
}
1591-
else if( const IECore::ShortData *data = runTimeCast<const IECore::ShortData>( attribute ) )
1591+
else if( const IECore::ShortData *sData = runTimeCast<const IECore::ShortData>( attribute ) )
15921592
{
1593-
setProperty<OInt16Property>( name, time, data );
1593+
setProperty<OInt16Property>( name, time, sData );
15941594
}
1595-
else if( const IECore::UIntData *data = runTimeCast<const IECore::UIntData>( attribute ) )
1595+
else if( const IECore::UIntData *uiData = runTimeCast<const IECore::UIntData>( attribute ) )
15961596
{
1597-
setProperty<OUInt32Property>( name, time, data );
1597+
setProperty<OUInt32Property>( name, time, uiData );
15981598
}
1599-
else if( const IECore::IntData *data = runTimeCast<const IECore::IntData>( attribute ) )
1599+
else if( const IECore::IntData *iData = runTimeCast<const IECore::IntData>( attribute ) )
16001600
{
1601-
setProperty<OInt32Property>( name, time, data );
1601+
setProperty<OInt32Property>( name, time, iData );
16021602
}
1603-
else if( const IECore::UInt64Data *data = runTimeCast<const IECore::UInt64Data>( attribute ) )
1603+
else if( const IECore::UInt64Data *ui64Data = runTimeCast<const IECore::UInt64Data>( attribute ) )
16041604
{
1605-
setProperty<OUInt64Property>( name, time, data );
1605+
setProperty<OUInt64Property>( name, time, ui64Data );
16061606
}
1607-
else if( const IECore::Int64Data *data = runTimeCast<const IECore::Int64Data>( attribute ) )
1607+
else if( const IECore::Int64Data *i64Data = runTimeCast<const IECore::Int64Data>( attribute ) )
16081608
{
1609-
setProperty<OInt64Property>( name, time, data );
1609+
setProperty<OInt64Property>( name, time, i64Data );
16101610
}
1611-
else if( const IECore::HalfData *data = runTimeCast<const IECore::HalfData>( attribute ) )
1611+
else if( const IECore::HalfData *hData = runTimeCast<const IECore::HalfData>( attribute ) )
16121612
{
1613-
setProperty<OHalfProperty>( name, time, data );
1613+
setProperty<OHalfProperty>( name, time, hData );
16141614
}
1615-
else if( const IECore::FloatData *data = runTimeCast<const IECore::FloatData>( attribute ) )
1615+
else if( const IECore::FloatData *fData = runTimeCast<const IECore::FloatData>( attribute ) )
16161616
{
1617-
setProperty<OFloatProperty>( name, time, data );
1617+
setProperty<OFloatProperty>( name, time, fData );
16181618
}
1619-
else if( const IECore::DoubleData *data = runTimeCast<const IECore::DoubleData>( attribute ) )
1619+
else if( const IECore::DoubleData *dData = runTimeCast<const IECore::DoubleData>( attribute ) )
16201620
{
1621-
setProperty<ODoubleProperty>( name, time, data );
1621+
setProperty<ODoubleProperty>( name, time, dData );
16221622
}
1623-
else if( const IECore::StringData *data = runTimeCast<const IECore::StringData>( attribute ) )
1623+
else if( const IECore::StringData *strData = runTimeCast<const IECore::StringData>( attribute ) )
16241624
{
1625-
setProperty<OStringProperty>( name, time, data );
1625+
setProperty<OStringProperty>( name, time, strData );
16261626
}
1627-
else if( const IECore::V2iData *data = runTimeCast<const IECore::V2iData>( attribute ) )
1627+
else if( const IECore::V2iData *v2iData = runTimeCast<const IECore::V2iData>( attribute ) )
16281628
{
1629-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1629+
if( v2iData->getInterpretation() == GeometricData::Interpretation::Point )
16301630
{
1631-
setProperty<OP2iProperty>( name, time, data );
1631+
setProperty<OP2iProperty>( name, time, v2iData );
16321632
}
16331633
else
16341634
{
1635-
setProperty<OV2iProperty>( name, time, data );
1635+
setProperty<OV2iProperty>( name, time, v2iData );
16361636
}
16371637
}
1638-
else if( const IECore::V2fData *data = runTimeCast<const IECore::V2fData>( attribute ) )
1638+
else if( const IECore::V2fData *v2fData = runTimeCast<const IECore::V2fData>( attribute ) )
16391639
{
1640-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1640+
if( v2fData->getInterpretation() == GeometricData::Interpretation::Point )
16411641
{
1642-
setProperty<OP2fProperty>( name, time, data );
1642+
setProperty<OP2fProperty>( name, time, v2fData );
16431643
}
1644-
else if( data->getInterpretation() == GeometricData::Interpretation::Normal )
1644+
else if( v2fData->getInterpretation() == GeometricData::Interpretation::Normal )
16451645
{
1646-
setProperty<ON2fProperty>( name, time, data );
1646+
setProperty<ON2fProperty>( name, time, v2fData );
16471647
}
16481648
else
16491649
{
1650-
setProperty<OV2fProperty>( name, time, data );
1650+
setProperty<OV2fProperty>( name, time, v2fData );
16511651
}
16521652
}
1653-
else if( const IECore::V2dData *data = runTimeCast<const IECore::V2dData>( attribute ) )
1653+
else if( const IECore::V2dData *v2dData = runTimeCast<const IECore::V2dData>( attribute ) )
16541654
{
1655-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1655+
if( v2dData->getInterpretation() == GeometricData::Interpretation::Point )
16561656
{
1657-
setProperty<OP2dProperty>( name, time, data );
1657+
setProperty<OP2dProperty>( name, time, v2dData );
16581658
}
1659-
else if( data->getInterpretation() == GeometricData::Interpretation::Normal )
1659+
else if( v2dData->getInterpretation() == GeometricData::Interpretation::Normal )
16601660
{
1661-
setProperty<ON2dProperty>( name, time, data );
1661+
setProperty<ON2dProperty>( name, time, v2dData );
16621662
}
16631663
else
16641664
{
1665-
setProperty<OV2dProperty>( name, time, data );
1665+
setProperty<OV2dProperty>( name, time, v2dData );
16661666
}
16671667
}
1668-
else if( const IECore::V3iData *data = runTimeCast<const IECore::V3iData>( attribute ) )
1668+
else if( const IECore::V3iData *v3iData = runTimeCast<const IECore::V3iData>( attribute ) )
16691669
{
1670-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1670+
if( v3iData->getInterpretation() == GeometricData::Interpretation::Point )
16711671
{
1672-
setProperty<OP3iProperty>( name, time, data );
1672+
setProperty<OP3iProperty>( name, time, v3iData );
16731673
}
16741674
else
16751675
{
1676-
setProperty<OV3iProperty>( name, time, data );
1676+
setProperty<OV3iProperty>( name, time, v3iData );
16771677
}
16781678
}
1679-
else if( const IECore::V3fData *data = runTimeCast<const IECore::V3fData>( attribute ) )
1679+
else if( const IECore::V3fData *v3fData = runTimeCast<const IECore::V3fData>( attribute ) )
16801680
{
1681-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1681+
if( v3fData->getInterpretation() == GeometricData::Interpretation::Point )
16821682
{
1683-
setProperty<OP3fProperty>( name, time, data );
1683+
setProperty<OP3fProperty>( name, time, v3fData );
16841684
}
1685-
else if( data->getInterpretation() == GeometricData::Interpretation::Normal )
1685+
else if( v3fData->getInterpretation() == GeometricData::Interpretation::Normal )
16861686
{
1687-
setProperty<ON3fProperty>( name, time, data );
1687+
setProperty<ON3fProperty>( name, time, v3fData );
16881688
}
16891689
else
16901690
{
1691-
setProperty<OV3fProperty>( name, time, data );
1691+
setProperty<OV3fProperty>( name, time, v3fData );
16921692
}
16931693
}
1694-
else if( const IECore::V3dData *data = runTimeCast<const IECore::V3dData>( attribute ) )
1694+
else if( const IECore::V3dData *v3dData = runTimeCast<const IECore::V3dData>( attribute ) )
16951695
{
16961696

1697-
if( data->getInterpretation() == GeometricData::Interpretation::Point )
1697+
if( v3dData->getInterpretation() == GeometricData::Interpretation::Point )
16981698
{
1699-
setProperty<OP3dProperty>( name, time, data );
1699+
setProperty<OP3dProperty>( name, time, v3dData );
17001700
}
1701-
else if( data->getInterpretation() == GeometricData::Interpretation::Normal )
1701+
else if( v3dData->getInterpretation() == GeometricData::Interpretation::Normal )
17021702
{
1703-
setProperty<ON3dProperty>( name, time, data );
1703+
setProperty<ON3dProperty>( name, time, v3dData );
17041704
}
17051705
else
17061706
{
1707-
setProperty<OV3dProperty>( name, time, data );
1707+
setProperty<OV3dProperty>( name, time, v3dData );
17081708
}
17091709
}
1710-
else if( const IECore::Box2iData *data = runTimeCast<const IECore::Box2iData>( attribute ) )
1710+
else if( const IECore::Box2iData *b2iData = runTimeCast<const IECore::Box2iData>( attribute ) )
17111711
{
1712-
setProperty<OBox2iProperty>( name, time, data );
1712+
setProperty<OBox2iProperty>( name, time, b2iData );
17131713
}
1714-
else if( const IECore::Box2fData *data = runTimeCast<const IECore::Box2fData>( attribute ) )
1714+
else if( const IECore::Box2fData *b2fData = runTimeCast<const IECore::Box2fData>( attribute ) )
17151715
{
1716-
setProperty<OBox2fProperty>( name, time, data );
1716+
setProperty<OBox2fProperty>( name, time, b2fData );
17171717
}
1718-
else if( const IECore::Box2dData *data = runTimeCast<const IECore::Box2dData>( attribute ) )
1718+
else if( const IECore::Box2dData *b2dData = runTimeCast<const IECore::Box2dData>( attribute ) )
17191719
{
1720-
setProperty<OBox2dProperty>( name, time, data );
1720+
setProperty<OBox2dProperty>( name, time, b2dData );
17211721
}
1722-
else if( const IECore::Box3iData *data = runTimeCast<const IECore::Box3iData>( attribute ) )
1722+
else if( const IECore::Box3iData *b3iData = runTimeCast<const IECore::Box3iData>( attribute ) )
17231723
{
1724-
setProperty<OBox3iProperty>( name, time, data );
1724+
setProperty<OBox3iProperty>( name, time, b3iData );
17251725
}
1726-
else if( const IECore::Box3fData *data = runTimeCast<const IECore::Box3fData>( attribute ) )
1726+
else if( const IECore::Box3fData *b3fData = runTimeCast<const IECore::Box3fData>( attribute ) )
17271727
{
1728-
setProperty<OBox3fProperty>( name, time, data );
1728+
setProperty<OBox3fProperty>( name, time, b3fData );
17291729
}
1730-
else if( const IECore::Box3dData *data = runTimeCast<const IECore::Box3dData>( attribute ) )
1730+
else if( const IECore::Box3dData *b3dData = runTimeCast<const IECore::Box3dData>( attribute ) )
17311731
{
1732-
setProperty<OBox3dProperty>( name, time, data );
1732+
setProperty<OBox3dProperty>( name, time, b3dData );
17331733
}
1734-
else if( const IECore::M33fData *data = runTimeCast<const IECore::M33fData>( attribute ) )
1734+
else if( const IECore::M33fData *m33fData = runTimeCast<const IECore::M33fData>( attribute ) )
17351735
{
1736-
setProperty<OM33fProperty>( name, time, data );
1736+
setProperty<OM33fProperty>( name, time, m33fData );
17371737
}
1738-
else if( const IECore::M33dData *data = runTimeCast<const IECore::M33dData>( attribute ) )
1738+
else if( const IECore::M33dData *m33dData = runTimeCast<const IECore::M33dData>( attribute ) )
17391739
{
1740-
setProperty<OM33dProperty>( name, time, data );
1740+
setProperty<OM33dProperty>( name, time, m33dData );
17411741
}
1742-
else if( const IECore::M44fData *data = runTimeCast<const IECore::M44fData>( attribute ) )
1742+
else if( const IECore::M44fData *m44fData = runTimeCast<const IECore::M44fData>( attribute ) )
17431743
{
1744-
setProperty<OM44fProperty>( name, time, data );
1744+
setProperty<OM44fProperty>( name, time, m44fData );
17451745
}
1746-
else if( const IECore::M44dData *data = runTimeCast<const IECore::M44dData>( attribute ) )
1746+
else if( const IECore::M44dData *m44dData = runTimeCast<const IECore::M44dData>( attribute ) )
17471747
{
1748-
setProperty<OM44dProperty>( name, time, data );
1748+
setProperty<OM44dProperty>( name, time, m44dData );
17491749
}
1750-
else if( const IECore::QuatfData *data = runTimeCast<const IECore::QuatfData>( attribute ) )
1750+
else if( const IECore::QuatfData *qfData = runTimeCast<const IECore::QuatfData>( attribute ) )
17511751
{
1752-
setProperty<OQuatfProperty>( name, time, data );
1752+
setProperty<OQuatfProperty>( name, time, qfData );
17531753
}
1754-
else if( const IECore::QuatdData *data = runTimeCast<const IECore::QuatdData>( attribute ) )
1754+
else if( const IECore::QuatdData *qdData = runTimeCast<const IECore::QuatdData>( attribute ) )
17551755
{
1756-
setProperty<OQuatdProperty>( name, time, data );
1756+
setProperty<OQuatdProperty>( name, time, qdData );
17571757
}
1758-
else if( const IECore::Color3fData *data = runTimeCast<const IECore::Color3fData>( attribute ) )
1758+
else if( const IECore::Color3fData *c3fData = runTimeCast<const IECore::Color3fData>( attribute ) )
17591759
{
1760-
setProperty<OC3fProperty>( name, time, data );
1760+
setProperty<OC3fProperty>( name, time, c3fData );
17611761
}
1762-
else if( const IECore::Color4fData *data = runTimeCast<const IECore::Color4fData>( attribute ) )
1762+
else if( const IECore::Color4fData *c4fData = runTimeCast<const IECore::Color4fData>( attribute ) )
17631763
{
1764-
setProperty<OC4fProperty>( name, time, data );
1764+
setProperty<OC4fProperty>( name, time, c4fData );
17651765
}
17661766
else
17671767
{

‎src/IECoreGL/LuminanceTexture.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ struct LuminanceTexture::Constructor
9595
std::vector<ElementType> interleaved( n * (ra ? 2 : 1) );
9696

9797
unsigned int i = 0;
98-
for( int y=height-1; y>=0; y-- )
98+
for( int iy=height-1; iy>=0; iy-- )
9999
{
100-
const ElementType *dy = &ry[y*width];
101-
const ElementType *da = ra ? &(*ra)[y*width] : nullptr;
100+
const ElementType *dy = &ry[iy*width];
101+
const ElementType *da = ra ? &(*ra)[iy*width] : nullptr;
102102

103103
for( unsigned int x=0; x<width; x++ )
104104
{

‎src/IECoreGL/Renderer.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,10 +485,10 @@ IECore::ConstDataPtr IECoreGL::Renderer::getOption( const std::string &name ) co
485485
}
486486
else if( name.compare( 0, 5, "user:" )==0 )
487487
{
488-
IECore::CompoundDataMap::const_iterator it = m_data->options.user.find( name );
489-
if( it!=m_data->options.user.end() )
488+
IECore::CompoundDataMap::const_iterator optionIt = m_data->options.user.find( name );
489+
if( optionIt!=m_data->options.user.end() )
490490
{
491-
return it->second;
491+
return optionIt->second;
492492
}
493493
else
494494
{
@@ -1938,7 +1938,7 @@ bool removeObjectWalk( IECoreGL::GroupPtr parent, IECoreGL::GroupPtr child, cons
19381938
{
19391939
// group after removal became empty, remove it too.
19401940
{
1941-
std::lock_guard<IECoreGL::Group::Mutex> lock( parent->mutex() );
1941+
std::lock_guard<IECoreGL::Group::Mutex> parentLock( parent->mutex() );
19421942
parent->removeChild( child.get() );
19431943
}
19441944
{

‎src/IECoreGL/ToGLStateConverter.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ StateComponentPtr attributeToColorState( const IECore::Object *attribute )
147147
{
148148
Imath::Color4f color( 1 );
149149

150-
if( auto d = runTimeCast<const Color3fVectorData>( attribute ) )
150+
if( auto vectorData = runTimeCast<const Color3fVectorData>( attribute ) )
151151
{
152-
const std::vector<Imath::Color3f> &v = d->readable();
152+
const std::vector<Imath::Color3f> &v = vectorData->readable();
153153
if( v.size() == 1 )
154154
{
155155
const Imath::Color3f &c = v[0];
@@ -160,13 +160,13 @@ StateComponentPtr attributeToColorState( const IECore::Object *attribute )
160160
IECore::msg( IECore::Msg::Warning, "ToGLStateConverter", "Expected array of length 1 for \"render:displayColor\"" );
161161
}
162162
}
163-
else if( auto d = runTimeCast<const Color4fData>( attribute ) )
163+
else if( auto color4fData = runTimeCast<const Color4fData>( attribute ) )
164164
{
165-
color = d->readable();
165+
color = color4fData->readable();
166166
}
167-
else if( auto d = runTimeCast<const Color3fData>( attribute ) )
167+
else if( auto color3fData = runTimeCast<const Color3fData>( attribute ) )
168168
{
169-
const Imath::Color3f &c = d->readable();
169+
const Imath::Color3f &c = color3fData->readable();
170170
color = Imath::Color4f( c[0], c[1], c[2], 1.0f );
171171
}
172172
else

‎src/IECoreImage/ImageThinner.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ void ImageThinner::modifyChannels( const Imath::Box2i &displayWindow, const Imat
148148
{
149149
count = 0;
150150

151-
for( int i = 0; i < 4 ; i++ )
151+
for( int j = 0; j < 4 ; j++ )
152152
{
153153

154-
int m = g_masks[i];
154+
int m = g_masks[j];
155155

156156
// Build initial previous scan buffer
157157

0 commit comments

Comments
 (0)