diff options
| author | Jose <jose@zeroc.com> | 2017-02-01 23:16:30 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-02-01 23:16:30 +0100 |
| commit | ca131951f8d81ea3da13277172a24234b5c848ea (patch) | |
| tree | 28b8d9ad6a09f550ef43f3b24df8048da8e70d7d /cpp/src/slice2java/Main.cpp | |
| parent | Added entries for support of try-with-resources/with statement in Java/Python (diff) | |
| download | ice-ca131951f8d81ea3da13277172a24234b5c848ea.tar.bz2 ice-ca131951f8d81ea3da13277172a24234b5c848ea.tar.xz ice-ca131951f8d81ea3da13277172a24234b5c848ea.zip | |
Add --no-warn option to Slice compilers
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
| -rw-r--r-- | cpp/src/slice2java/Main.cpp | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 86b07bf60d5..2ea06372755 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -87,6 +87,7 @@ 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" ; } @@ -115,6 +116,7 @@ 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; @@ -193,6 +195,8 @@ 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; @@ -350,7 +354,7 @@ compile(const vector<string>& argv) { if(compat) { - GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output, tie); + GenCompat gen(argv[0], icecpp->getBaseName(), includePaths, output, tie, warningLevel); gen.generate(p); if(impl) { @@ -360,39 +364,28 @@ compile(const vector<string>& argv) { gen.generateImplTie(p); } - if(!checksumClass.empty()) - { - // - // Calculate checksums for the Slice definitions in the unit. - // - ChecksumMap m = createChecksums(p); - copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); - } - if(listGenerated) - { - FileTracker::instance()->setOutput(os.str(), false); - } } else { - Gen gen(argv[0], icecpp->getBaseName(), includePaths, output); + Gen gen(argv[0], icecpp->getBaseName(), includePaths, output, warningLevel); gen.generate(p); if(impl) { gen.generateImpl(p); } - if(!checksumClass.empty()) - { - // - // Calculate checksums for the Slice definitions in the unit. - // - ChecksumMap m = createChecksums(p); - copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); - } - if(listGenerated) - { - FileTracker::instance()->setOutput(os.str(), false); - } + } + + if(!checksumClass.empty()) + { + // + // Calculate checksums for the Slice definitions in the unit. + // + ChecksumMap m = createChecksums(p); + copy(m.begin(), m.end(), inserter(checksums, checksums.begin())); + } + if(listGenerated) + { + FileTracker::instance()->setOutput(os.str(), false); } } catch(const Slice::FileException& ex) |