Extra C++ warning flags with clang and g++.

Fixes 223.

1 files changed, 16 insertions, 16 deletions

diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index e14565a6c4a..c4b3f48726b 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -2307,12 +2307,12 @@ Slice::Python::CodeVisitor::stripMarkup(const string& comment)
         string::size_type start = 0;
         while(start != string::npos)
         {
-            string::size_type nl = text.find_first_of("\r\n", start);
+            string::size_type newline = text.find_first_of("\r\n", start);
             string line;
-            if(nl != string::npos)
+            if(newline != string::npos)
             {
-                line = text.substr(start, nl - start);
-                start = nl;
+                line = text.substr(start, newline - start);
+                start = newline;
             }
             else
             {
@@ -2849,7 +2849,7 @@ Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode
 }
 
 string
-Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
+Slice::Python::getPackageDirectory(const string& file, const UnitPtr& ut)
 {
     //
     // file must be a fully-qualified path name.
@@ -2858,7 +2858,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
     const string prefix = "python:pkgdir:";
     string pkgdir = dc->findMetaData(prefix);
@@ -2874,7 +2874,7 @@ Slice::Python::getPackageDirectory(const string& file, const UnitPtr& unit)
 }
 
 string
-Slice::Python::getImportFileName(const string& file, const UnitPtr& unit, const vector<string>& includePaths)
+Slice::Python::getImportFileName(const string& file, const UnitPtr& ut, const vector<string>& includePaths)
 {
     //
     // The file and includePaths arguments must be fully-qualified path names.
@@ -2883,7 +2883,7 @@ Slice::Python::getImportFileName(const string& file, const UnitPtr& unit, const
     //
     // Check if the file contains the python:pkgdir global metadata.
     //
-    string pkgdir = getPackageDirectory(file, unit);
+    string pkgdir = getPackageDirectory(file, ut);
     if(!pkgdir.empty())
     {
         //
@@ -3046,11 +3046,11 @@ Slice::Python::getPackageMetadata(const ContainedPtr& cont)
     string q;
     if(!m->findMetaData(prefix, q))
     {
-        UnitPtr unit = cont->unit();
+        UnitPtr ut = cont->unit();
         string file = cont->file();
         assert(!file.empty());
 
-        DefinitionContextPtr dc = unit->findDefinitionContext(file);
+        DefinitionContextPtr dc = ut->findDefinitionContext(file);
         assert(dc);
         q = dc->findMetaData(prefix);
     }
@@ -3232,8 +3232,8 @@ Slice::Python::MetaDataVisitor::visitSequence(const SequencePtr& p)
     const string file = p->file();
     const string line = p->line();
     StringList protobufMetaData;
-    const UnitPtr unit = p->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = p->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     for(StringList::const_iterator q = metaData.begin(); q != metaData.end(); )
@@ -3285,8 +3285,8 @@ StringList
 Slice::Python::MetaDataVisitor::validateSequence(const string& file, const string& line,
                                                  const TypePtr& type, const StringList& metaData)
 {
-    const UnitPtr unit = type->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(file);
+    const UnitPtr ut = type->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(file);
     assert(dc);
 
     static const string prefix = "python:";
@@ -3322,8 +3322,8 @@ Slice::Python::MetaDataVisitor::reject(const ContainedPtr& cont)
     StringList localMetaData = cont->getMetaData();
     static const string prefix = "python:";
 
-    const UnitPtr unit = cont->unit();
-    const DefinitionContextPtr dc = unit->findDefinitionContext(cont->file());
+    const UnitPtr ut = cont->unit();
+    const DefinitionContextPtr dc = ut->findDefinitionContext(cont->file());
     assert(dc);
 
     for(StringList::const_iterator p = localMetaData.begin(); p != localMetaData.end();)