1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 692bfdec12c..3f4fe0a93ee 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -856,16 +856,16 @@ writeDict(const string& n, UnitPtr& u, const Dict& dict, Output& H, Output& C, c
 		    }
 		    dataMembers = structDecl->dataMembers();
 		}
-		DataMemberList::const_iterator q = dataMembers.begin();
-		while(q != dataMembers.end() && dataMember == 0)
+		DataMemberList::const_iterator d = dataMembers.begin();
+		while(d != dataMembers.end() && dataMember == 0)
 		{
-		    if((*q)->name() == index.member)
+		    if((*d)->name() == index.member)
 		    {
-			dataMember = *q;
+			dataMember = *d;
 		    }
 		    else
 		    {
-			++q;
+			++d;
 		    }
 		}
 		
@@ -1237,8 +1237,8 @@ main(int argc, char* argv[])
     }
     if(opts.isSet("dict"))
     {
-	vector<string> args = opts.argVec("dict");
-	for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+	vector<string> optargs = opts.argVec("dict");
+	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
 	    string s = *i;
 	    s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
@@ -1323,8 +1323,8 @@ main(int argc, char* argv[])
     }
     if(opts.isSet("index"))
     {
-	vector<string> args = opts.argVec("index");
-	for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+	vector<string> optargs = opts.argVec("index");
+	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
 	    string s = *i;
 	    s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());
@@ -1392,8 +1392,8 @@ main(int argc, char* argv[])
     }
     if(opts.isSet("dict-index"))
     {
-	vector<string> args = opts.argVec("dict-index");
-	for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i)
+	vector<string> optargs = opts.argVec("dict-index");
+	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
 	    string s = *i;
 	    s.erase(remove_if(s.begin(), s.end(), ::isspace), s.end());