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

Fixes 223.

4 files changed, 24 insertions, 1 deletions

diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp
index f095ca9166d..ecee4fa5419 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.cpp
+++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp
@@ -13,6 +13,15 @@
 #include <sstream>
 #include <algorithm>
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wshadow-field"
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using namespace std;
 using namespace IceUtilInternal;
 
diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp
index 16629ab5aa5..3eff17700c0 100644
--- a/cpp/src/slice2confluence/Gen.cpp
+++ b/cpp/src/slice2confluence/Gen.cpp
@@ -27,6 +27,15 @@
 
 #include <string>
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wshadow"
+#   pragma clang diagnostic ignored "-Wshadow-field"
+#   pragma clang diagnostic ignored "-Wunused-parameter"
+#elif defined(__GNUC__)
+#   pragma GCC diagnostic ignored "-Wshadow"
+#   pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif
+
 using namespace std;
 using namespace Slice;
 using namespace IceUtil;
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index e6558ec3984..abc59399e06 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -16,6 +16,11 @@
 
 #include <iterator>
 
+#if defined(__clang__)
+// TODO: fix these warnings!
+#   pragma clang diagnostic ignored "-Wshadow-field"
+#endif
+
 namespace Slice
 {
 
diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp
index 0e6b6c21e56..2d30cada84d 100644
--- a/cpp/src/slice2confluence/Main.cpp
+++ b/cpp/src/slice2confluence/Main.cpp
@@ -71,7 +71,7 @@ splitCommas(string& str)
 }
 
 void
-interruptedCallback(int signal)
+interruptedCallback(int)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(globalMutex);