Rework warning suppression to use global meta data

5 files changed, 136 insertions, 119 deletions

diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index 376a8edd86e..f33a44286cd 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -144,9 +144,8 @@ string ofFactory(const TypePtr& type)
 
 }
 
-Slice::JavaVisitor::JavaVisitor(const string& dir, int warningLevel) :
-    JavaGenerator(dir),
-    ParserVisitor(warningLevel)
+Slice::JavaVisitor::JavaVisitor(const string& dir) :
+    JavaGenerator(dir)
 {
 }
 
@@ -2299,12 +2298,10 @@ Slice::JavaVisitor::writeServantDocComment(Output& out, const OperationPtr& p, c
     out << nl << " **/";
 }
 
-Slice::Gen::Gen(const string& /*name*/, const string& base, const vector<string>& includePaths, const string& dir,
-                int warningLevel) :
+Slice::Gen::Gen(const string& /*name*/, const string& base, const vector<string>& includePaths, const string& dir) :
     _base(base),
     _includePaths(includePaths),
-    _dir(dir),
-    _warningLevel(warningLevel)
+    _dir(dir)
 {
 }
 
@@ -2315,31 +2312,31 @@ Slice::Gen::~Gen()
 void
 Slice::Gen::generate(const UnitPtr& p)
 {
-    JavaGenerator::validateMetaData(p, _warningLevel);
+    JavaGenerator::validateMetaData(p);
 
-    PackageVisitor packageVisitor(_dir, _warningLevel);
+    PackageVisitor packageVisitor(_dir);
     p->visit(&packageVisitor, false);
 
-    TypesVisitor typesVisitor(_dir, _warningLevel);
+    TypesVisitor typesVisitor(_dir);
     p->visit(&typesVisitor, false);
 
-    CompactIdVisitor compactIdVisitor(_dir, _warningLevel);
+    CompactIdVisitor compactIdVisitor(_dir);
     p->visit(&compactIdVisitor, false);
 
-    HelperVisitor helperVisitor(_dir, _warningLevel);
+    HelperVisitor helperVisitor(_dir);
     p->visit(&helperVisitor, false);
 
-    ProxyVisitor proxyVisitor(_dir, _warningLevel);
+    ProxyVisitor proxyVisitor(_dir);
     p->visit(&proxyVisitor, false);
 
-    DispatcherVisitor dispatcherVisitor(_dir, _warningLevel);
+    DispatcherVisitor dispatcherVisitor(_dir);
     p->visit(&dispatcherVisitor, false);
 }
 
 void
 Slice::Gen::generateImpl(const UnitPtr& p)
 {
-    ImplVisitor implVisitor(_dir, _warningLevel);
+    ImplVisitor implVisitor(_dir);
     p->visit(&implVisitor, false);
 }
 
@@ -2398,8 +2395,8 @@ Slice::Gen::writeChecksumClass(const string& checksumClass, const string& dir, c
     out << nl;
 }
 
-Slice::Gen::PackageVisitor::PackageVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::PackageVisitor::PackageVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -2423,8 +2420,8 @@ Slice::Gen::PackageVisitor::visitModuleStart(const ModulePtr& p)
     return false;
 }
 
-Slice::Gen::TypesVisitor::TypesVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::TypesVisitor::TypesVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -2760,10 +2757,15 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
         string serialVersionUID;
         if(p->findMetaData("java:serialVersionUID", serialVersionUID))
         {
+            const UnitPtr unit = p->unit();
+            const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+            assert(dc);
+            bool emitWarnings = !dc->suppressWarning("invalid-metadata");
+
             string::size_type pos = serialVersionUID.rfind(":") + 1;
             if(pos == string::npos)
             {
-                if(warningLevel() > 0)
+                if(emitWarnings)
                 {
                     ostringstream os;
                     os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value";
@@ -2779,7 +2781,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
                 {
                     if(!stringToInt64(serialVersionUID, v)) // conversion error
                     {
-                        if(warningLevel() > 0)
+                        if(emitWarnings)
                         {
                             ostringstream os;
                             os << "ignoring invalid serialVersionUID for class `" << p->scoped()
@@ -3291,10 +3293,15 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
+        const UnitPtr unit = p->unit();
+        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        assert(dc);
+        bool emitWarnings = !dc->suppressWarning("invalid-metadata");
+
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
         {
-            if(warningLevel() > 0)
+            if(emitWarnings)
             {
                 ostringstream os;
                 os << "ignoring invalid serialVersionUID for exception `" << p->scoped() << "'; generating default value";
@@ -3310,7 +3317,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             {
                 if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
-                    if(warningLevel() > 0)
+                    if(emitWarnings)
                     {
                         ostringstream os;
                         os << "ignoring invalid serialVersionUID for exception `" << p->scoped()
@@ -3610,10 +3617,14 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
+        const UnitPtr unit = p->unit();
+        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        assert(dc);
+        bool emitWarnings = !dc->suppressWarning("invalid-metadata");
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
         {
-            if(warningLevel() > 0)
+            if(emitWarnings)
             {
                 ostringstream os;
                 os << "ignoring invalid serialVersionUID for struct `" << p->scoped() << "'; generating default value";
@@ -3629,7 +3640,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
             {
                 if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
-                    if(warningLevel() > 0)
+                    if(emitWarnings)
                     {
                         ostringstream os;
                         os << "ignoring invalid serialVersionUID for struct `" << p->scoped()
@@ -4160,8 +4171,8 @@ Slice::Gen::TypesVisitor::validateMethod(const OperationList& ops, const std::st
     return true;
 }
 
-Slice::Gen::CompactIdVisitor::CompactIdVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::CompactIdVisitor::CompactIdVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -4190,8 +4201,8 @@ Slice::Gen::CompactIdVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::Gen::HelperVisitor::HelperVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::HelperVisitor::HelperVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -4355,8 +4366,8 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p)
     close();
 }
 
-Slice::Gen::ProxyVisitor::ProxyVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::ProxyVisitor::ProxyVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -5110,8 +5121,8 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     }
 }
 
-Slice::Gen::DispatcherVisitor::DispatcherVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::DispatcherVisitor::DispatcherVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
@@ -5184,8 +5195,8 @@ Slice::Gen::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::Gen::ImplVisitor::ImplVisitor(const string& dir, int warningLevel) :
-    JavaVisitor(dir, warningLevel)
+Slice::Gen::ImplVisitor::ImplVisitor(const string& dir) :
+    JavaVisitor(dir)
 {
 }
 
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index d2ce2ef44c1..11c7d0f7e45 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -25,7 +25,7 @@ public:
 
 protected:
 
-    JavaVisitor(const std::string&, int);
+    JavaVisitor(const std::string&);
 
     enum ParamDir { InParam, OutParam };
 
@@ -129,8 +129,7 @@ public:
     Gen(const std::string&,
         const std::string&,
         const std::vector<std::string>&,
-        const std::string&,
-        int);
+        const std::string&);
     ~Gen();
 
     void generate(const UnitPtr&);
@@ -143,13 +142,12 @@ private:
     std::string _base;
     std::vector<std::string> _includePaths;
     std::string _dir;
-    int _warningLevel;
 
     class PackageVisitor : public JavaVisitor
     {
     public:
 
-        PackageVisitor(const std::string&, int);
+        PackageVisitor(const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
     };
@@ -158,7 +156,7 @@ private:
     {
     public:
 
-        TypesVisitor(const std::string&, int);
+        TypesVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -183,7 +181,7 @@ private:
     {
     public:
 
-        CompactIdVisitor(const std::string&, int);
+        CompactIdVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -192,7 +190,7 @@ private:
     {
     public:
 
-        HelperVisitor(const std::string&, int);
+        HelperVisitor(const std::string&);
 
         virtual void visitSequence(const SequencePtr&);
         virtual void visitDictionary(const DictionaryPtr&);
@@ -202,7 +200,7 @@ private:
     {
     public:
 
-        ProxyVisitor(const std::string&, int);
+        ProxyVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -213,7 +211,7 @@ private:
     {
     public:
 
-        DispatcherVisitor(const std::string&, int);
+        DispatcherVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -222,7 +220,7 @@ private:
     {
     public:
 
-        ImplVisitor(const std::string&, int);
+        ImplVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
 
diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp
index 6579642d280..a3f4179ed8f 100644
--- a/cpp/src/slice2java/GenCompat.cpp
+++ b/cpp/src/slice2java/GenCompat.cpp
@@ -191,9 +191,8 @@ writeParamList(Output& out, vector<string> params, bool end = true, bool newLine
 
 }
 
-Slice::JavaCompatVisitor::JavaCompatVisitor(const string& dir, int warningLevel) :
-    JavaCompatGenerator(dir),
-    ParserVisitor(warningLevel)
+Slice::JavaCompatVisitor::JavaCompatVisitor(const string& dir) :
+    JavaCompatGenerator(dir)
 {
 }
 
@@ -2280,12 +2279,11 @@ Slice::JavaCompatVisitor::writeDocCommentParam(Output& out, const OperationPtr&
 }
 
 Slice::GenCompat::GenCompat(const string& /*name*/, const string& base, const vector<string>& includePaths, 
-                            const string& dir, bool tie, int warningLevel) :
+                            const string& dir, bool tie) :
     _base(base),
     _includePaths(includePaths),
     _dir(dir),
-    _tie(tie),
-    _warningLevel(warningLevel)
+    _tie(tie)
 {
 }
 
@@ -2296,47 +2294,47 @@ Slice::GenCompat::~GenCompat()
 void
 Slice::GenCompat::generate(const UnitPtr& p)
 {
-    JavaGenerator::validateMetaData(p, _warningLevel);
+    JavaGenerator::validateMetaData(p);
 
-    OpsVisitor opsVisitor(_dir, _warningLevel);
+    OpsVisitor opsVisitor(_dir);
     p->visit(&opsVisitor, false);
 
-    PackageVisitor packageVisitor(_dir, _warningLevel);
+    PackageVisitor packageVisitor(_dir);
     p->visit(&packageVisitor, false);
 
-    TypesVisitor typesVisitor(_dir, _warningLevel);
+    TypesVisitor typesVisitor(_dir);
     p->visit(&typesVisitor, false);
 
-    CompactIdVisitor compactIdVisitor(_dir, _warningLevel);
+    CompactIdVisitor compactIdVisitor(_dir);
     p->visit(&compactIdVisitor, false);
 
-    HolderVisitor holderVisitor(_dir, _warningLevel);
+    HolderVisitor holderVisitor(_dir);
     p->visit(&holderVisitor, false);
 
-    HelperVisitor helperVisitor(_dir, _warningLevel);
+    HelperVisitor helperVisitor(_dir);
     p->visit(&helperVisitor, false);
 
-    ProxyVisitor proxyVisitor(_dir, _warningLevel);
+    ProxyVisitor proxyVisitor(_dir);
     p->visit(&proxyVisitor, false);
 
-    DispatcherVisitor dispatcherVisitor(_dir, _tie, _warningLevel);
+    DispatcherVisitor dispatcherVisitor(_dir, _tie);
     p->visit(&dispatcherVisitor, false);
 
-    AsyncVisitor asyncVisitor(_dir, _warningLevel);
+    AsyncVisitor asyncVisitor(_dir);
     p->visit(&asyncVisitor, false);
 }
 
 void
 Slice::GenCompat::generateImpl(const UnitPtr& p)
 {
-    ImplVisitor implVisitor(_dir, _warningLevel);
+    ImplVisitor implVisitor(_dir);
     p->visit(&implVisitor, false);
 }
 
 void
 Slice::GenCompat::generateImplTie(const UnitPtr& p)
 {
-    ImplTieVisitor implTieVisitor(_dir, _warningLevel);
+    ImplTieVisitor implTieVisitor(_dir);
     p->visit(&implTieVisitor, false);
 }
 
@@ -2395,8 +2393,8 @@ Slice::GenCompat::writeChecksumClass(const string& checksumClass, const string&
     out << nl;
 }
 
-Slice::GenCompat::OpsVisitor::OpsVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::OpsVisitor::OpsVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -2530,8 +2528,8 @@ Slice::GenCompat::OpsVisitor::writeOperations(const ClassDefPtr& p, bool noCurre
     close();
 }
 
-Slice::GenCompat::PackageVisitor::PackageVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::PackageVisitor::PackageVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -2555,8 +2553,8 @@ Slice::GenCompat::PackageVisitor::visitModuleStart(const ModulePtr& p)
     return false;
 }
 
-Slice::GenCompat::TypesVisitor::TypesVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::TypesVisitor::TypesVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -3014,10 +3012,14 @@ Slice::GenCompat::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
+        const UnitPtr unit = p->unit();
+        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        assert(dc);
+        bool emitWarnings = !dc->suppressWarning("invalid-metadata");
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
         {
-            if(warningLevel() > 0)
+            if(emitWarnings)
             {
                 ostringstream os;
                 os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value";
@@ -3033,7 +3035,7 @@ Slice::GenCompat::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p)
             {
                 if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
-                    if(warningLevel() > 0)
+                    if(emitWarnings)
                     {
                         ostringstream os;
                         os << "ignoring invalid serialVersionUID for class `" << p->scoped()
@@ -3440,10 +3442,14 @@ Slice::GenCompat::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
+        const UnitPtr unit = p->unit();
+        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        assert(dc);
+        bool emitWarnings = !dc->suppressWarning("invalid-metadata");
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
         {
-            if(warningLevel() > 0)
+            if(emitWarnings)
             {
                 ostringstream os;
                 os << "ignoring invalid serialVersionUID for exception `" << p->scoped() << "'; generating default value";
@@ -3459,7 +3465,7 @@ Slice::GenCompat::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
             {
                 if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
-                    if(warningLevel() > 0)
+                    if(emitWarnings)
                     {
                         ostringstream os;
                         os << "ignoring invalid serialVersionUID for exception `" << p->scoped()
@@ -3762,10 +3768,14 @@ Slice::GenCompat::TypesVisitor::visitStructEnd(const StructPtr& p)
     string serialVersionUID;
     if(p->findMetaData("java:serialVersionUID", serialVersionUID))
     {
+        const UnitPtr unit = p->unit();
+        const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+        assert(dc);
+        bool emitWarnings = !dc->suppressWarning("invalid-metadata");
         string::size_type pos = serialVersionUID.rfind(":") + 1;
         if(pos == string::npos)
         {
-            if(warningLevel() > 0)
+            if(emitWarnings)
             {
                 ostringstream os;
                 os << "ignoring invalid serialVersionUID for struct `" << p->scoped() << "'; generating default value";
@@ -3781,7 +3791,7 @@ Slice::GenCompat::TypesVisitor::visitStructEnd(const StructPtr& p)
             {
                 if(!stringToInt64(serialVersionUID, v)) // conversion error
                 {
-                    if(warningLevel() > 0)
+                    if(emitWarnings)
                     {
                         ostringstream os;
                         os << "ignoring invalid serialVersionUID for struct `" << p->scoped()
@@ -4212,8 +4222,8 @@ Slice::GenCompat::TypesVisitor::validateMethod(const OperationList& ops, const s
     return true;
 }
 
-Slice::GenCompat::CompactIdVisitor::CompactIdVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::CompactIdVisitor::CompactIdVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -4242,8 +4252,8 @@ Slice::GenCompat::CompactIdVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::GenCompat::HolderVisitor::HolderVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::HolderVisitor::HolderVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -4391,8 +4401,8 @@ Slice::GenCompat::HolderVisitor::writeHolder(const TypePtr& p)
     close();
 }
 
-Slice::GenCompat::HelperVisitor::HelperVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::HelperVisitor::HelperVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -5324,8 +5334,8 @@ Slice::GenCompat::HelperVisitor::writeOperation(const ClassDefPtr& p, const stri
     }
 }
 
-Slice::GenCompat::ProxyVisitor::ProxyVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::ProxyVisitor::ProxyVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -5644,8 +5654,8 @@ Slice::GenCompat::ProxyVisitor::visitOperation(const OperationPtr& p)
     }
 }
 
-Slice::GenCompat::DispatcherVisitor::DispatcherVisitor(const string& dir, bool tie, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel),
+Slice::GenCompat::DispatcherVisitor::DispatcherVisitor(const string& dir, bool tie) :
+    JavaCompatVisitor(dir),
     _tie(tie)
 {
 }
@@ -5843,10 +5853,14 @@ Slice::GenCompat::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
         string serialVersionUID;
         if(p->findMetaData("java:serialVersionUID", serialVersionUID))
         {
+            const UnitPtr unit = p->unit();
+            const DefinitionContextPtr dc = unit->findDefinitionContext(p->file());
+            assert(dc);
+            bool emitWarnings = !dc->suppressWarning("invalid-metadata");
             string::size_type pos = serialVersionUID.rfind(":") + 1;
             if(pos == string::npos)
             {
-                if(warningLevel() > 0)
+                if(emitWarnings)
                 {
                     ostringstream os;
                     os << "ignoring invalid serialVersionUID for class `" << p->scoped() << "'; generating default value";
@@ -5862,7 +5876,7 @@ Slice::GenCompat::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
                 {
                     if(!stringToInt64(serialVersionUID, v)) // conversion error
                     {
-                        if(warningLevel() > 0)
+                        if(emitWarnings)
                         {
                             ostringstream os;
                             os << "ignoring invalid serialVersionUID for class `" << p->scoped()
@@ -5887,8 +5901,8 @@ Slice::GenCompat::DispatcherVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::GenCompat::BaseImplVisitor::BaseImplVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::BaseImplVisitor::BaseImplVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
@@ -6152,8 +6166,8 @@ Slice::GenCompat::BaseImplVisitor::writeOperation(Output& out, const string& pac
     }
 }
 
-Slice::GenCompat::ImplVisitor::ImplVisitor(const string& dir, int warningLevel) :
-    BaseImplVisitor(dir, warningLevel)
+Slice::GenCompat::ImplVisitor::ImplVisitor(const string& dir) :
+    BaseImplVisitor(dir)
 {
 }
 
@@ -6208,8 +6222,8 @@ Slice::GenCompat::ImplVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::GenCompat::ImplTieVisitor::ImplTieVisitor(const string& dir, int warningLevel) :
-    BaseImplVisitor(dir, warningLevel)
+Slice::GenCompat::ImplTieVisitor::ImplTieVisitor(const string& dir) :
+    BaseImplVisitor(dir)
 {
 }
 
@@ -6297,8 +6311,8 @@ Slice::GenCompat::ImplTieVisitor::visitClassDefStart(const ClassDefPtr& p)
     return false;
 }
 
-Slice::GenCompat::AsyncVisitor::AsyncVisitor(const string& dir, int warningLevel) :
-    JavaCompatVisitor(dir, warningLevel)
+Slice::GenCompat::AsyncVisitor::AsyncVisitor(const string& dir) :
+    JavaCompatVisitor(dir)
 {
 }
 
diff --git a/cpp/src/slice2java/GenCompat.h b/cpp/src/slice2java/GenCompat.h
index 25d2d0b7091..5f8ba85aa9d 100644
--- a/cpp/src/slice2java/GenCompat.h
+++ b/cpp/src/slice2java/GenCompat.h
@@ -25,7 +25,7 @@ public:
 
 protected:
 
-    JavaCompatVisitor(const std::string&, int);
+    JavaCompatVisitor(const std::string&);
 
     enum ParamDir { InParam, OutParam };
 
@@ -131,8 +131,7 @@ public:
               const std::string&,
               const std::vector<std::string>&,
               const std::string&,
-              bool,
-              int);
+              bool);
     ~GenCompat();
 
     void generate(const UnitPtr&);
@@ -147,13 +146,12 @@ private:
     std::vector<std::string> _includePaths;
     std::string _dir;
     bool _tie;
-    int _warningLevel;
 
     class OpsVisitor : public JavaCompatVisitor
     {
     public:
 
-        OpsVisitor(const std::string&, int);
+        OpsVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
 
@@ -165,7 +163,7 @@ private:
     {
     public:
 
-        PackageVisitor(const std::string&, int);
+        PackageVisitor(const std::string&);
 
         virtual bool visitModuleStart(const ModulePtr&);
     };
@@ -174,7 +172,7 @@ private:
     {
     public:
 
-        TypesVisitor(const std::string&, int);
+        TypesVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -198,7 +196,7 @@ private:
     {
     public:
 
-        CompactIdVisitor(const std::string&, int);
+        CompactIdVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -207,7 +205,7 @@ private:
     {
     public:
 
-        HolderVisitor(const std::string&, int);
+        HolderVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual bool visitStructStart(const StructPtr&);
@@ -224,7 +222,7 @@ private:
     {
     public:
 
-        HelperVisitor(const std::string&, int);
+        HelperVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitSequence(const SequencePtr&);
@@ -239,7 +237,7 @@ private:
     {
     public:
 
-        ProxyVisitor(const std::string&, int);
+        ProxyVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
         virtual void visitClassDefEnd(const ClassDefPtr&);
@@ -250,7 +248,7 @@ private:
     {
     public:
 
-        DispatcherVisitor(const std::string&, bool, int);
+        DispatcherVisitor(const std::string&, bool);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
 
@@ -262,7 +260,7 @@ private:
     {
     public:
 
-        BaseImplVisitor(const std::string&, int);
+        BaseImplVisitor(const std::string&);
 
     protected:
 
@@ -288,7 +286,7 @@ private:
     {
     public:
 
-        ImplVisitor(const std::string&, int);
+        ImplVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -297,7 +295,7 @@ private:
     {
     public:
 
-        ImplTieVisitor(const std::string&, int);
+        ImplTieVisitor(const std::string&);
 
         virtual bool visitClassDefStart(const ClassDefPtr&);
     };
@@ -306,7 +304,7 @@ private:
     {
     public:
 
-        AsyncVisitor(const std::string&, int);
+        AsyncVisitor(const std::string&);
 
         virtual void visitOperation(const OperationPtr&);
     };
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index c14a467d3b7..a1ff63c6127 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -87,7 +87,6 @@ usage(const string& n)
         "                        deprecated: use instead [[\"ice-prefix\"]] metadata.\n"
         "--underscore            Allow underscores in Slice identifiers\n"
         "                        deprecated: use instead [[\"underscore\"]] metadata.\n"
-        "--no-warn               Disable all warnings.\n"
         ;
 }
 
@@ -116,7 +115,6 @@ compile(const vector<string>& argv)
     opts.addOpt("", "checksum", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "meta", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat);
     opts.addOpt("", "compat");
-    opts.addOpt("", "no-warn");
 
     bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end();
     vector<string>args;
@@ -195,8 +193,6 @@ compile(const vector<string>& argv)
 
     bool compat = opts.isSet("compat");
 
-    int warningLevel = opts.isSet("no-warn") ? 0 : 1;
-
     if(args.empty())
     {
         consoleErr << argv[0] << ": error: no input file" << endl;
@@ -354,7 +350,7 @@ compile(const vector<string>& argv)
                     {
                         if(compat)
                         {
-                            GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output, tie, warningLevel);
+                            GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output, tie);
                             gen.generate(p);
                             if(impl)
                             {
@@ -367,7 +363,7 @@ compile(const vector<string>& argv)
                         }
                         else
                         {
-                            Gen gen(argv[0], icecpp->getBaseName(), includePaths, output, warningLevel);
+                            Gen gen(argv[0], icecpp->getBaseName(), includePaths, output);
                             gen.generate(p);
                             if(impl)
                             {
@@ -380,7 +376,7 @@ compile(const vector<string>& argv)
                             //
                             // Calculate checksums for the Slice definitions in the unit.
                             //
-                            ChecksumMap m = createChecksums(p, warningLevel);
+                            ChecksumMap m = createChecksums(p);
                             copy(m.begin(), m.end(), inserter(checksums, checksums.begin()));
                         }
                         if(listGenerated)