summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2005-09-08 05:01:02 +0000
committerMatthew Newhook <matthew@zeroc.com>2005-09-08 05:01:02 +0000
commit96f03676876c78b4bfe1132919fb8dbedbf7efe8 (patch)
treec31dd885938bc808920c39340d17c9b681035df6 /cpp/src
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=353 (diff)
downloadice-96f03676876c78b4bfe1132919fb8dbedbf7efe8.tar.bz2
ice-96f03676876c78b4bfe1132919fb8dbedbf7efe8.tar.xz
ice-96f03676876c78b4bfe1132919fb8dbedbf7efe8.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=353
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/Object.cpp2
-rw-r--r--cpp/src/slice2cppe/Gen.cpp2
-rw-r--r--cpp/src/slice2javae/Gen.cpp1
3 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index dc1c2626ac9..4cc7a9edf32 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -263,7 +263,7 @@ operationModeToString(OperationMode mode)
}
void
-Ice::Object::__checkMode(OperationMode expected, OperationMode received) const
+Ice::Object::__checkMode(OperationMode expected, OperationMode received)
{
if(expected != received)
{
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp
index 0e160b0c096..24786a87c2c 100644
--- a/cpp/src/slice2cppe/Gen.cpp
+++ b/cpp/src/slice2cppe/Gen.cpp
@@ -2274,6 +2274,8 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
throws.sort(Slice::DerivedToBaseCompare());
#endif
+ C << nl << "__checkMode(" << operationModeToString(p->mode()) << ", __current.mode);";
+
if(!inParams.empty())
{
C << nl << "::IceInternal::BasicStream* __is = __in.is();";
diff --git a/cpp/src/slice2javae/Gen.cpp b/cpp/src/slice2javae/Gen.cpp
index a6b08020003..69e06826012 100644
--- a/cpp/src/slice2javae/Gen.cpp
+++ b/cpp/src/slice2javae/Gen.cpp
@@ -478,6 +478,7 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p)
int iter;
+ out << nl << "__checkMode(" << sliceModeToIceMode(op) << ", __current.mode);";
if(!inParams.empty())
{
out << nl << "IceInternal.BasicStream __is = __in.is();";