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();";