diff options
| author | Jose <jose@zeroc.com> | 2017-02-03 18:10:20 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-02-03 18:10:20 +0100 |
| commit | 7274ebf13c7a1ff3b587598335201c3a4e848c90 (patch) | |
| tree | ad673e775b6ab68d511bcc86cf420c519b65948d /cpp/src/slice2java/Main.cpp | |
| parent | Connection::close fixes for C#/Java/JS (diff) | |
| download | ice-7274ebf13c7a1ff3b587598335201c3a4e848c90.tar.bz2 ice-7274ebf13c7a1ff3b587598335201c3a4e848c90.tar.xz ice-7274ebf13c7a1ff3b587598335201c3a4e848c90.zip | |
Rework warning suppression to use global meta data
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
| -rw-r--r-- | cpp/src/slice2java/Main.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
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) |