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

Fixes 223.

3 files changed, 18 insertions, 11 deletions

diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp
index 108d4c8da1a..d753073e370 100644
--- a/cpp/src/slice2objc/Gen.cpp
+++ b/cpp/src/slice2objc/Gen.cpp
@@ -28,6 +28,13 @@ using namespace std;
 using namespace Slice;
 using namespace IceUtilInternal;
 
+// TODO: fix this warning!
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
 namespace
 {
 
@@ -661,7 +668,7 @@ Slice::ObjCVisitor::getServerArgs(const OperationPtr& op) const
     return result;
 }
 
-Slice::Gen::Gen(const string& name, const string& base, const string& include, const vector<string>& includePaths,
+Slice::Gen::Gen(const string& /*name*/, const string& base, const string& include, const vector<string>& includePaths,
                 const string& dir, const string& dllExport) :
     _base(base),
     _include(include),
@@ -901,7 +908,7 @@ Slice::Gen::UnitVisitor::visitModuleStart(const ModulePtr& p)
 }
 
 void
-Slice::Gen::UnitVisitor::visitUnitEnd(const UnitPtr& unit)
+Slice::Gen::UnitVisitor::visitUnitEnd(const UnitPtr&)
 {
     string uuid = IceUtil::generateUUID();
     for(string::size_type pos = 0; pos < uuid.size(); ++pos)
@@ -1624,7 +1631,7 @@ Slice::Gen::TypesVisitor::writeConstantValue(IceUtilInternal::Output& out, const
 }
 
 void
-Slice::Gen::TypesVisitor::writeInit(const ContainedPtr& p, const DataMemberList& dataMembers,
+Slice::Gen::TypesVisitor::writeInit(const ContainedPtr&, const DataMemberList& dataMembers,
                                     const DataMemberList& baseDataMembers, const DataMemberList& allDataMembers,
                                     bool requiresMemberInit, int baseType, ContainerType ct) const
 {
@@ -1778,7 +1785,7 @@ Slice::Gen::TypesVisitor::writeMembers(const DataMemberList& dataMembers, int ba
 }
 
 void
-Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers, int baseType,
+Slice::Gen::TypesVisitor::writeMemberSignature(const DataMemberList& dataMembers, int /*baseType*/,
                                                ContainerType ct) const
 {
     if(ct == LocalException)
@@ -2671,7 +2678,7 @@ Slice::Gen::DelegateMVisitor::DelegateMVisitor(Output& H, Output& M, const strin
 }
 
 bool
-Slice::Gen::DelegateMVisitor::visitModuleStart(const ModulePtr& p)
+Slice::Gen::DelegateMVisitor::visitModuleStart(const ModulePtr&)
 {
     return true;
 }
@@ -3019,7 +3026,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p)
 }
 
 void
-Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr& p)
+Slice::Gen::DelegateMVisitor::visitClassDefEnd(const ClassDefPtr&)
 {
     _H << nl << "@end";
     _M << nl << "@end";
diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp
index c0f09d940ee..a191491fa5e 100644
--- a/cpp/src/slice2objc/Main.cpp
+++ b/cpp/src/slice2objc/Main.cpp
@@ -48,7 +48,7 @@ Init init;
 }
 
 void
-interruptedCallback(int signal)
+interruptedCallback(int)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);
     interrupted = true;
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 242ed701287..b1e49e69464 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -148,7 +148,7 @@ Slice::ObjCGenerator::moduleName(const ModulePtr& m)
 }
 
 ModulePtr
-Slice::ObjCGenerator::findModule(const ContainedPtr& cont, int baseTypes, bool mangleCasts)
+Slice::ObjCGenerator::findModule(const ContainedPtr& cont, int /*baseTypes*/, bool /*mangleCasts*/)
 {
     ModulePtr m = ModulePtr::dynamicCast(cont);
     ContainerPtr container = cont->container();
@@ -244,13 +244,13 @@ Slice::ObjCGenerator::getFactoryMethod(const ContainedPtr& p, bool deprecated)
     }
     else
     {
-        for(string::iterator p = name.begin(); p != name.end() && isalpha(*p); ++p)
+        for(string::iterator q = name.begin(); q != name.end() && isalpha(*q); ++q)
         {
-            if(p != name.end() - 1 && isalpha(*(p + 1)) && !isupper(*(p + 1)))
+            if(q != name.end() - 1 && isalpha(*(q + 1)) && !isupper(*(q + 1)))
             {
                 break;
             }
-            *p = tolower(*p);
+            *q = tolower(*q);
         }
     }
     return name;