Rework warning suppression to use global meta data

3 files changed, 15 insertions, 23 deletions

diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index bd226fbd027..54383af7030 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -37,7 +37,7 @@ namespace Slice
 void
 generate(const UnitPtr& unit, const string& dir, const string& header, const string& footer,
          const string& indexHeader, const string& indexFooter, const string& imageDir, const string& logoURL,
-         const string& searchAction, unsigned indexCount, unsigned warnSummary, int warningLevel)
+         const string& searchAction, unsigned indexCount, unsigned warnSummary)
 {
     unit->mergeModules();
 
@@ -66,19 +66,19 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str
     // to the symbol; if the latter, we cannot.
     //
     Files files;
-    FileVisitor tv(files, warningLevel);
+    FileVisitor tv(files);
     unit->visit(&tv, false);
 
     //
     // Generate the start page.
     //
-    StartPageVisitor spv(files, warningLevel);
+    StartPageVisitor spv(files);
     unit->visit(&spv, false);
 
     //
     // Generate the table of contents.
     //
-    TOCVisitor tocv(files, indexHeader, indexFooter, warningLevel);
+    TOCVisitor tocv(files, indexHeader, indexFooter);
     unit->visit(&tocv, false);
     tocv.generate();
 
@@ -86,7 +86,7 @@ generate(const UnitPtr& unit, const string& dir, const string& header, const str
     // Generate the individual HTML pages.
     //
     GeneratorBase::setSymbols(tocv.symbols());
-    PageVisitor v(files, warningLevel);
+    PageVisitor v(files);
     unit->visit(&v, false);
 }
 
@@ -1800,8 +1800,7 @@ Slice::StartPageGenerator::printHeaderFooter()
     end(); // table
 }
 
-Slice::FileVisitor::FileVisitor(Files& files, int warningLevel) :
-	ParserVisitor(warningLevel),
+Slice::FileVisitor::FileVisitor(Files& files) :
     _files(files)
 {
 }
@@ -1864,8 +1863,7 @@ Slice::FileVisitor::visitEnum(const EnumPtr& e)
     _files.insert(e->file());
 }
 
-Slice::StartPageVisitor::StartPageVisitor(const Files& files, int warningLevel) :
-	ParserVisitor(warningLevel),
+Slice::StartPageVisitor::StartPageVisitor(const Files& files) :
     _spg(files)
 {
 }
@@ -2043,8 +2041,7 @@ TOCGenerator::writeEntry(const ContainedPtr& c)
     end();
 }
 
-TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer, int warningLevel) :
-	ParserVisitor(warningLevel),
+TOCVisitor::TOCVisitor(const Files& files, const string& header, const string& footer) :
     _tg(files, header, footer)
 {
 }
@@ -2979,8 +2976,7 @@ Slice::EnumGenerator::generate(const EnumPtr& e)
     assert(_out.currIndent() == indent);
 }
 
-Slice::PageVisitor::PageVisitor(const Files& files, int warningLevel) :
-	ParserVisitor(warningLevel),
+Slice::PageVisitor::PageVisitor(const Files& files) :
 	_files(files)
 {
 }
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index b38556e4bb2..8fb67136bc0 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -18,7 +18,7 @@ namespace Slice
 
 void generate(const UnitPtr&, const ::std::string&, const ::std::string&, const ::std::string&, const std::string&,
               const ::std::string&, const ::std::string&, const ::std::string&, const ::std::string&,
-              unsigned, unsigned, int);
+              unsigned, unsigned);
 
 typedef ::std::set< ::std::string> Files;
 
@@ -141,7 +141,7 @@ class FileVisitor : private ::IceUtil::noncopyable, public ParserVisitor
 {
 public:
 
-    FileVisitor(Files&, int);
+    FileVisitor(Files&);
 
     virtual bool visitUnitStart(const UnitPtr&);
     virtual bool visitModuleStart(const ModulePtr&);
@@ -162,7 +162,7 @@ class StartPageVisitor : private ::IceUtil::noncopyable, public ParserVisitor
 {
 public:
 
-    StartPageVisitor(const Files&, int);
+    StartPageVisitor(const Files&);
 
     virtual bool visitUnitStart(const UnitPtr&);
     virtual bool visitModuleStart(const ModulePtr&);
@@ -195,7 +195,7 @@ class TOCVisitor : private ::IceUtil::noncopyable, public ParserVisitor
 {
 public:
 
-    TOCVisitor(const Files&, const ::std::string&, const ::std::string&, int);
+    TOCVisitor(const Files&, const ::std::string&, const ::std::string&);
 
     virtual bool visitUnitStart(const UnitPtr&);
     virtual bool visitModuleStart(const ModulePtr&);
@@ -255,7 +255,7 @@ class PageVisitor : private ::IceUtil::noncopyable, public ParserVisitor
 {
 public:
 
-    PageVisitor(const Files&, int);
+    PageVisitor(const Files&);
 
     virtual bool visitUnitStart(const UnitPtr&);
     virtual bool visitModuleStart(const ModulePtr&);
diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp
index 7b5a6562968..ae2bfaa75ff 100644
--- a/cpp/src/slice2html/Main.cpp
+++ b/cpp/src/slice2html/Main.cpp
@@ -85,7 +85,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"
         ;
 }
 
@@ -113,7 +112,6 @@ compile(const vector<string>& argv)
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
-    opts.addOpt("", "no-warn");
 
     bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end();
     vector<string> args;
@@ -222,8 +220,6 @@ compile(const vector<string>& argv)
 
     bool underscore = opts.isSet("underscore");
 
-    int warningLevel = opts.isSet("no-warn") ? 0 : 1;
-
     if(args.empty())
     {
         consoleErr << argv[0] << ": error: no input file" << endl;
@@ -294,7 +290,7 @@ compile(const vector<string>& argv)
         try
         {
             Slice::generate(p, output, header, footer, indexHeader, indexFooter, imageDir, logoURL,
-                            searchAction, indexCount, summaryCount, warningLevel);
+                            searchAction, indexCount, summaryCount);
         }
         catch(const Slice::FileException& ex)
         {