1 files changed, 55 insertions, 55 deletions

diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index dd6a5d86cd9..34e00c0cae8 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -152,31 +152,31 @@ DispatchStatus
 Ice::Object::__dispatch(Incoming& in, const Current& current)
 {
     pair<string*, string*> r =
-	equal_range(__all, __all + sizeof(__all) / sizeof(string), current.operation);
+        equal_range(__all, __all + sizeof(__all) / sizeof(string), current.operation);
 
     if(r.first == r.second)
     {
-	return DispatchOperationNotExist;
-    }					     
+        return DispatchOperationNotExist;
+    }                                        
 
     switch(r.first - __all)
     {
         case 0:
         {
-	    return ___ice_id(in, current);
+            return ___ice_id(in, current);
         }
         case 1:
         {
-	    return ___ice_ids(in, current);
+            return ___ice_ids(in, current);
         }
         case 2:
-	{
-	    return ___ice_isA(in, current);
-	}
-	case 3:
-	{
-	    return ___ice_ping(in, current);
-	}
+        {
+            return ___ice_isA(in, current);
+        }
+        case 3:
+        {
+            return ___ice_ping(in, current);
+        }
     }
 
     assert(false);
@@ -197,8 +197,8 @@ Ice::Object::__read(BasicStream* __is, bool __rid)
 {
     if(__rid)
     {
-	string myId;
-	__is->readTypeId(myId);
+        string myId;
+        __is->readTypeId(myId);
     }
 
     __is->startReadSlice();
@@ -208,7 +208,7 @@ Ice::Object::__read(BasicStream* __is, bool __rid)
     __is->readSize(sz);
     if(sz != 0)
     {
-	throw Ice::MarshalException(__FILE__, __LINE__);
+        throw Ice::MarshalException(__FILE__, __LINE__);
     }
 
     __is->endReadSlice();
@@ -228,7 +228,7 @@ Ice::Object::__read(const InputStreamPtr& __inS, bool __rid)
 {
     if(__rid)
     {
-	__inS->readTypeId();
+        __inS->readTypeId();
     }
 
     __inS->startSlice();
@@ -237,7 +237,7 @@ Ice::Object::__read(const InputStreamPtr& __inS, bool __rid)
     Int sz = __inS->readSize();
     if(sz != 0)
     {
-	throw Ice::MarshalException(__FILE__, __LINE__);
+        throw Ice::MarshalException(__FILE__, __LINE__);
     }
 
     __inS->endSlice();
@@ -256,13 +256,13 @@ operationModeToString(OperationMode mode)
     switch(mode)
     {
     case Normal:
-	return "::Ice::Normal";
+        return "::Ice::Normal";
 
     case Nonmutating:
-	return "::Ice::Nonmutating";
+        return "::Ice::Nonmutating";
 
     case Idempotent:
-	return "::Ice::Idempotent";
+        return "::Ice::Idempotent";
     }
 
     ostringstream os;
@@ -275,29 +275,29 @@ Ice::Object::__checkMode(OperationMode expected, OperationMode received)
 {
     if(expected != received)
     {
-	if(expected == Idempotent && received == Nonmutating)
-	{
-	    // 
-	    // Fine: typically an old client still using the deprecated nonmutating keyword
-	    //
-	    
-	    //
-	    // Note that expected == Nonmutating and received == Idempotent is not ok:
-	    // the server may still use the deprecated nonmutating keyword to detect updates
-	    // and the client should not break this (deprecated) feature.
-	    //
-	}
-	else
-	{
-	    Ice::MarshalException ex(__FILE__, __LINE__);
-	    std::ostringstream __reason;
-	    __reason << "unexpected operation mode. expected = "
-		     << operationModeToString(expected)
-		     << " received = "
-		     << operationModeToString(received);
-	    ex.reason = __reason.str();
-	    throw ex;
-	}
+        if(expected == Idempotent && received == Nonmutating)
+        {
+            // 
+            // Fine: typically an old client still using the deprecated nonmutating keyword
+            //
+            
+            //
+            // Note that expected == Nonmutating and received == Idempotent is not ok:
+            // the server may still use the deprecated nonmutating keyword to detect updates
+            // and the client should not break this (deprecated) feature.
+            //
+        }
+        else
+        {
+            Ice::MarshalException ex(__FILE__, __LINE__);
+            std::ostringstream __reason;
+            __reason << "unexpected operation mode. expected = "
+                     << operationModeToString(expected)
+                     << " received = "
+                     << operationModeToString(received);
+            ex.reason = __reason.str();
+            throw ex;
+        }
     }
 }
 
@@ -312,11 +312,11 @@ Ice::Blobject::__dispatch(Incoming& in, const Current& current)
     in.os()->writeBlob(outParams);
     if(ok)
     {
-	return DispatchOK;
+        return DispatchOK;
     }
     else
     {
-	return DispatchUserException;
+        return DispatchUserException;
     }
 }
 
@@ -332,11 +332,11 @@ Ice::BlobjectArray::__dispatch(Incoming& in, const Current& current)
     in.os()->writeBlob(outParams);
     if(ok)
     {
-	return DispatchOK;
+        return DispatchOK;
     }
     else
     {
-	return DispatchUserException;
+        return DispatchUserException;
     }
 }
 
@@ -349,19 +349,19 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
     AMD_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Object_ice_invoke(in);
     try
     {
-	ice_invoke_async(cb, inParams, current);
+        ice_invoke_async(cb, inParams, current);
     }
     catch(const Exception& ex)
     {
-	cb->ice_exception(ex);
+        cb->ice_exception(ex);
     }
     catch(const ::std::exception& ex)
     {
-	cb->ice_exception(ex);
+        cb->ice_exception(ex);
     }
     catch(...)
     {
-	cb->ice_exception();
+        cb->ice_exception();
     }
     return DispatchAsync;
 }
@@ -376,19 +376,19 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
     AMD_Array_Object_ice_invokePtr cb = new ::IceAsync::Ice::AMD_Array_Object_ice_invoke(in);
     try
     {
-	ice_invoke_async(cb, inParams, current);
+        ice_invoke_async(cb, inParams, current);
     }
     catch(const Exception& ex)
     {
-	cb->ice_exception(ex);
+        cb->ice_exception(ex);
     }
     catch(const ::std::exception& ex)
     {
-	cb->ice_exception(ex);
+        cb->ice_exception(ex);
     }
     catch(...)
     {
-	cb->ice_exception();
+        cb->ice_exception();
     }
     return DispatchAsync;
 }