diff options
Diffstat (limited to 'cpp/src/slice2java')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 9 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 121044f9283..5c374dc57e8 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -149,8 +149,7 @@ Slice::JavaVisitor::writeDelegateThrowsClause(const string& scope, const Excepti out << nl; out << "throws "; out.useCurrentPosAsIndent(); - out << "Ice.LocationForward,"; - out << nl << "IceInternal.NonRepeatable"; + out << "IceInternal.NonRepeatable"; // // Don't include local exceptions in the throws clause @@ -1729,7 +1728,7 @@ Slice::Gen::TypesVisitor::visitEnum(const EnumPtr& p) } void -Slice::Gen::TypesVisitor::visitConstDef(const ConstDefPtr& p) +Slice::Gen::TypesVisitor::visitConst(const ConstPtr& p) { string name = fixKwd(p->name()); string scoped = p->scoped(); @@ -2052,10 +2051,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "return;"; } out << eb; - out << nl << "catch(Ice.LocationForward __ex)"; - out << sb; - out << nl << "__locationForward(__ex);"; - out << eb; out << nl << "catch(IceInternal.NonRepeatable __ex)"; out << sb; if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating) diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index a39d7544631..acd94cb7c55 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -121,7 +121,7 @@ private: virtual bool visitStructStart(const StructPtr&); virtual void visitStructEnd(const StructPtr&); virtual void visitEnum(const EnumPtr&); - virtual void visitConstDef(const ConstDefPtr&); + virtual void visitConst(const ConstPtr&); virtual void visitDataMember(const DataMemberPtr&); }; |