diff options
Diffstat (limited to 'cpp/src/slice2cpp')
-rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 4 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 4d66c8d8aec..997d58f3d27 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -625,12 +625,12 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) C << eb; } - H << nl << "virtual const ::std::string ice_name() const;"; + H << nl << "virtual ::std::string ice_name() const;"; string flatName = p->flattenedScope() + p->name() + "_name"; C << sp << nl << "static const char* " << flatName << " = \"" << p->scoped().substr(2) << "\";"; - C << sp << nl << "const ::std::string" << nl << scoped.substr(2) << "::ice_name() const"; + C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const"; C << sb; C << nl << "return " << flatName << ';'; C << eb; diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index fdc7e5f89d7..e46a2a3ce97 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -86,7 +86,7 @@ main(int argc, char* argv[]) { args = opts.parse(argc, (const char**)argv); } - catch(const IceUtil::Options::BadOpt& e) + catch(const IceUtil::BadOptException& e) { cerr << argv[0] << ": " << e.reason << endl; usage(argv[0]); |