From 304c048d84e3ff0f0bb32ead04fd9c5ce9cd9b0b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 26 May 2016 10:24:44 +0100
Subject: [PATCH] Fixed shadows warnings

---
 examples/osganalysis/osganalysis.cpp | 8 ++++----
 examples/osgcatch/osgcatch.cpp       | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/osganalysis/osganalysis.cpp b/examples/osganalysis/osganalysis.cpp
index 1a0d238dc..9c81bf37c 100644
--- a/examples/osganalysis/osganalysis.cpp
+++ b/examples/osganalysis/osganalysis.cpp
@@ -104,9 +104,9 @@ public:
     {
         if (!stateset) return;
 
-        for(unsigned int i=0; i<stateset->getNumTextureAttributeLists(); ++i)
+        for(unsigned int ti=0; ti<stateset->getNumTextureAttributeLists(); ++ti)
         {
-            osg::StateAttribute* sa = stateset->getTextureAttribute(i, osg::StateAttribute::TEXTURE);
+            osg::StateAttribute* sa = stateset->getTextureAttribute(ti, osg::StateAttribute::TEXTURE);
             osg::Texture* texture = dynamic_cast<osg::Texture*>(sa);
             if (texture)
             {
@@ -782,8 +782,8 @@ int main(int argc, char** argv)
             modelIndex<fileNames.size() &&
             (currentTime-timeOfLastMerge)>timeBetweenMerges)
         {
-            std::string filename = fileNames[modelIndex++];
-            std::string outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
+            filename = fileNames[modelIndex++];
+            outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
 
             databasePagingOperation = new DatabasePagingOperation(
                 filename,
diff --git a/examples/osgcatch/osgcatch.cpp b/examples/osgcatch/osgcatch.cpp
index 19cd48248..8108ed3fc 100644
--- a/examples/osgcatch/osgcatch.cpp
+++ b/examples/osgcatch/osgcatch.cpp
@@ -107,10 +107,10 @@ Character::Character():
 }
 
 
-void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& width, const osg::Vec3& catchPos, float positionRatio)
+void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& cwidth, const osg::Vec3& catchPos, float positionRatio)
 {
     _origin = origin;
-    _width = width;
+    _width = cwidth;
     _positionRatio = positionRatio;
     _numLives = 3;
     _numCatches = 0;