diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2swift/Gen.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2swift/Main.cpp | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp index c11e1cf55c1..be173732f74 100644 --- a/cpp/src/slice2swift/Gen.cpp +++ b/cpp/src/slice2swift/Gen.cpp @@ -997,9 +997,9 @@ Gen::ProxyVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "public func uncheckedCast" << spar << ("prx: " + getUnqualified("Ice.ObjectPrx", swiftModule)) << ("type: " + prx + ".Protocol") - << ("facet: String? = nil") << epar << " -> " << prx << "?"; + << ("facet: String? = nil") << epar << " -> " << prx; out << sb; - out << nl << "return " << prxI << ".uncheckedCast(prx: prx, facet: facet) as " << prxI << "?"; + out << nl << "return " << prxI << ".uncheckedCast(prx: prx, facet: facet) as " << prxI; out << eb; // diff --git a/cpp/src/slice2swift/Main.cpp b/cpp/src/slice2swift/Main.cpp index 2a045087260..973b3020f47 100644 --- a/cpp/src/slice2swift/Main.cpp +++ b/cpp/src/slice2swift/Main.cpp @@ -78,7 +78,6 @@ usage(const string& n) "--depend-xml Generate dependencies in XML format.\n" "--depend-file FILE Write dependencies to FILE instead of standard output.\n" "--validate Validate command line options.\n" - "--list-generated Emit list of generated files in XML format.\n" ; } @@ -97,7 +96,6 @@ compile(const vector<string>& argv) opts.addOpt("", "depend"); opts.addOpt("", "depend-xml"); opts.addOpt("", "depend-file", IceUtilInternal::Options::NeedArg, ""); - opts.addOpt("", "list-generated"); opts.addOpt("d", "debug"); bool validate = find(argv.begin(), argv.end(), "--validate") != argv.end(); @@ -160,8 +158,6 @@ compile(const vector<string>& argv) bool debug = opts.isSet("debug"); - bool listGenerated = opts.isSet("list-generated"); - if(args.empty()) { consoleErr << argv[0] << ": error: no input file" << endl; @@ -337,11 +333,6 @@ compile(const vector<string>& argv) writeDependencies(os.str(), dependFile); } - if(listGenerated) - { - FileTracker::instance()->dumpxml(); - } - return status; } |