Rework warning suppression to use global meta data

1 files changed, 7 insertions, 12 deletions

diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp
index 057fb22cca4..bc1da962d70 100644
--- a/cpp/src/Slice/Python.cpp
+++ b/cpp/src/Slice/Python.cpp
@@ -101,13 +101,13 @@ class PackageVisitor : public ParserVisitor
 {
 public:
 
-    static void createModules(const UnitPtr&, const string&, const string&, int);
+    static void createModules(const UnitPtr&, const string&, const string&);
 
     virtual void visitModuleEnd(const ModulePtr&);
 
 private:
 
-    PackageVisitor(StringList&, int);
+    PackageVisitor(StringList&);
 
     enum ReadState { PreModules, InModules, InSubmodules };
 
@@ -128,17 +128,16 @@ private:
 const char* PackageVisitor::_moduleTag = "# Modules:";
 const char* PackageVisitor::_submoduleTag = "# Submodules:";
 
-PackageVisitor::PackageVisitor(StringList& modules, int warningLevel) :
-    ParserVisitor(warningLevel),
+PackageVisitor::PackageVisitor(StringList& modules) :
     _modules(modules)
 {
 }
 
 void
-PackageVisitor::createModules(const UnitPtr& unit, const string& module, const string& dir, int warningLevel)
+PackageVisitor::createModules(const UnitPtr& unit, const string& module, const string& dir)
 {
     StringList modules;
-    PackageVisitor v(modules, warningLevel);
+    PackageVisitor v(modules);
     unit->visit(&v, false);
 
     for(StringList::iterator p = modules.begin(); p != modules.end(); ++p)
@@ -404,7 +403,6 @@ usage(const string& n)
         "--all                Generate code for Slice definitions in included files.\n"
         "--checksum           Generate checksums for Slice definitions.\n"
         "--prefix PREFIX      Prepend filenames of Python modules with PREFIX.\n"
-        "--no-warn            Disable all warnings.\n"
         ;
 }
 
@@ -432,7 +430,6 @@ Slice::Python::compile(const vector<string>& argv)
     opts.addOpt("", "build-package");
     opts.addOpt("", "checksum");
     opts.addOpt("", "prefix", IceUtilInternal::Options::NeedArg);
-    opts.addOpt("", "no-warn");
 
     vector<string> args;
     try
@@ -503,8 +500,6 @@ Slice::Python::compile(const vector<string>& argv)
 
     string prefix = opts.optArg("prefix");
 
-    int warningLevel = opts.isSet("no-warn") ? 0 : 1;
-
     if(args.empty())
     {
         consoleErr << argv[0] << ": error: no input file" << endl;
@@ -670,7 +665,7 @@ Slice::Python::compile(const vector<string>& argv)
                             //
                             // Generate Python code.
                             //
-                            generate(u, all, checksum, includePaths, out, warningLevel);
+                            generate(u, all, checksum, includePaths, out);
 
                             out.close();
                         }
@@ -680,7 +675,7 @@ Slice::Python::compile(const vector<string>& argv)
                         //
                         if(!noPackage)
                         {
-                            PackageVisitor::createModules(u, prefix + base + "_ice", output, warningLevel);
+                            PackageVisitor::createModules(u, prefix + base + "_ice", output);
                         }
                     }
                     catch(const Slice::FileException& ex)