diff options
| author | Mark Spruiell <mes@zeroc.com> | 2011-05-04 17:51:35 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2011-05-04 17:51:35 -0700 |
| commit | 9afd50c19bceeb2be64bf0c7c6d7a0c2c126dde8 (patch) | |
| tree | 44786ffd2f2bf17f6872f97ea109cb09243d9cf9 /cpp/src | |
| parent | minor doc fixes for RHEL (diff) | |
| download | ice-9afd50c19bceeb2be64bf0c7c6d7a0c2c126dde8.tar.bz2 ice-9afd50c19bceeb2be64bf0c7c6d7a0c2c126dde8.tar.xz ice-9afd50c19bceeb2be64bf0c7c6d7a0c2c126dde8.zip | |
bug 4976 - inconsistent operation mode for pseudo ops
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 28bcac92a3d..29a0fdda59b 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -154,7 +154,7 @@ IceProxy::Ice::Object::begin_ice_isA(const string& typeId, __checkAsyncTwowayOnly(ice_isA_name); try { - __result->__prepare(ice_isA_name, Normal, ctx); + __result->__prepare(ice_isA_name, Nonmutating, ctx); IceInternal::BasicStream* __os = __result->__getOs(); __os->write(typeId); __os->endWriteEncaps(); @@ -222,7 +222,7 @@ IceProxy::Ice::Object::begin_ice_ping(const Context* ctx, OutgoingAsyncPtr __result = new OutgoingAsync(this, ice_ping_name, del, cookie); try { - __result->__prepare(ice_ping_name, Normal, ctx); + __result->__prepare(ice_ping_name, Nonmutating, ctx); IceInternal::BasicStream* __os = __result->__getOs(); __os->endWriteEncaps(); __result->__send(true); @@ -297,7 +297,7 @@ IceProxy::Ice::Object::begin_ice_ids(const Context* ctx, __checkAsyncTwowayOnly(ice_ids_name); try { - __result->__prepare(ice_ids_name, Normal, ctx); + __result->__prepare(ice_ids_name, Nonmutating, ctx); IceInternal::BasicStream* __os = __result->__getOs(); __os->endWriteEncaps(); __result->__send(true); @@ -341,7 +341,7 @@ IceProxy::Ice::Object::begin_ice_id(const Context* ctx, __checkAsyncTwowayOnly(ice_id_name); try { - __result->__prepare(ice_id_name, Normal, ctx); + __result->__prepare(ice_id_name, Nonmutating, ctx); IceInternal::BasicStream* __os = __result->__getOs(); __os->endWriteEncaps(); __result->__send(true); diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 5c0bf6b3cbf..719c7424610 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -4017,7 +4017,7 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) << "_name, __cb);"; out << nl << "try"; out << sb; - out << nl << "__result.__prepare(__" << op->name() << "_name, " << sliceModeToIceMode(op->mode()) + out << nl << "__result.__prepare(__" << op->name() << "_name, " << sliceModeToIceMode(op->sendMode()) << ", __ctx, __explicitCtx);"; out << nl << "IceInternal.BasicStream __os = __result.__os();"; iter = 0; |