Fixes shadows warnings

2016-05-20 13:38:34 +01:00
parent e900ecc4c7
commit ae3ba28fee
6 changed files with 29 additions and 33 deletions
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -1504,11 +1504,11 @@ void Geometry::fixDeprecatedData()
    // we start processing the primitive sets.
    int target_vindex = 0;
    int source_pindex = -1; // equals primitiveNum
-    for(PrimitiveSetList::iterator itr = _primitives.begin();
-        itr != _primitives.end();
-        ++itr)
+    for(PrimitiveSetList::iterator prim_itr = _primitives.begin();
+        prim_itr != _primitives.end();
+        ++prim_itr)
    {
-        osg::PrimitiveSet* primitiveset = itr->get();
+        osg::PrimitiveSet* primitiveset = prim_itr->get();
        GLenum mode=primitiveset->getMode();

        unsigned int primLength;