diff options
author | Mark Spruiell <mes@zeroc.com> | 2002-01-29 06:55:52 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2002-01-29 06:55:52 +0000 |
commit | 6312c1e7e689e5817a289a30e08a55690fc5bc0f (patch) | |
tree | 228f6c35ac8cd73e913c33d8a906ee79d8f3106e /cpp | |
parent | align with stable_31 (diff) | |
download | ice-6312c1e7e689e5817a289a30e08a55690fc5bc0f.tar.bz2 ice-6312c1e7e689e5817a289a30e08a55690fc5bc0f.tar.xz ice-6312c1e7e689e5817a289a30e08a55690fc5bc0f.zip |
fix for stable_31 compatibility (temporarily removing 1.22 revision)
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/slice2java/Gen.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index cdab743ae50..db74da952d2 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -2269,9 +2269,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << eb; out << nl << "catch (IceInternal.NonRepeatable __ex)"; out << sb; - list<string> metaData = op->getMetaData(); - bool nonmutating = find(metaData.begin(), metaData.end(), "nonmutating") != metaData.end(); - if (nonmutating) + if (op->nonmutating()) { out << nl << "__cnt = __handleException(__ex.get(), __cnt);"; } @@ -3075,10 +3073,10 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) out << "java.util.Map __context)"; writeDelegateThrowsClause(scope, throws); out << sb; - list<string> metaData = op->getMetaData(); - bool nonmutating = find(metaData.begin(), metaData.end(), "nonmutating") != metaData.end(); - out << nl << "IceInternal.Outgoing __out = new IceInternal.Outgoing(__connection, __reference, false, \"" - << op->name() << "\", " << (nonmutating ? "true" : "false") << ", __context);"; + out << nl << "IceInternal.Outgoing __out = new " + << "IceInternal.Outgoing(__connection, __reference, \"" + << op->name() << "\", " << (op->nonmutating() ? "true" : "false") + << ", __context);"; if (!inParams.empty()) { out << nl << "IceInternal.BasicStream __os = __out.os();"; |