1 files changed, 20 insertions, 19 deletions

diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 0d1e125ec8d..d2c70989e72 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -15,6 +15,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/Protocol.h>
 #include <Ice/Instance.h>
+#include <Ice/ReplyStatus.h>
 
 using namespace std;
 using namespace Ice;
@@ -321,12 +322,12 @@ IceInternal::Outgoing::finished(BasicStream& is)
     assert(_state <= StateInProgress);
 
     _is.swap(is);
-    Byte status;
-    _is.read(status);
+    Byte replyStatus;
+    _is.read(replyStatus);
     
-    switch(static_cast<DispatchStatus>(status))
+    switch(replyStatus)
     {
-        case DispatchOK:
+        case replyOK:
         {
             //
             // Input and output parameters are always sent in an
@@ -338,7 +339,7 @@ IceInternal::Outgoing::finished(BasicStream& is)
             break;
         }
         
-        case DispatchUserException:
+        case replyUserException:
         {
             //
             // Input and output parameters are always sent in an
@@ -350,9 +351,9 @@ IceInternal::Outgoing::finished(BasicStream& is)
             break;
         }
         
-        case DispatchObjectNotExist:
-        case DispatchFacetNotExist:
-        case DispatchOperationNotExist:
+        case replyObjectNotExist:
+        case replyFacetNotExist:
+        case replyOperationNotExist:
         {
             //
             // Don't read the exception members directly into the
@@ -381,21 +382,21 @@ IceInternal::Outgoing::finished(BasicStream& is)
             _is.read(operation, false);
             
             RequestFailedException* ex;
-            switch(static_cast<DispatchStatus>(status))
+            switch(replyStatus)
             {
-                case DispatchObjectNotExist:
+                case replyObjectNotExist:
                 {
                     ex = new ObjectNotExistException(__FILE__, __LINE__);
                     break;
                 }
                 
-                case DispatchFacetNotExist:
+                case replyFacetNotExist:
                 {
                     ex = new FacetNotExistException(__FILE__, __LINE__);
                     break;
                 }
                 
-                case DispatchOperationNotExist:
+                case replyOperationNotExist:
                 {
                     ex = new OperationNotExistException(__FILE__, __LINE__);
                     break;
@@ -418,9 +419,9 @@ IceInternal::Outgoing::finished(BasicStream& is)
             break;
         }
         
-        case DispatchUnknownException:
-        case DispatchUnknownLocalException:
-        case DispatchUnknownUserException:
+        case replyUnknownException:
+        case replyUnknownLocalException:
+        case replyUnknownUserException:
         {
             //
             // Don't read the exception members directly into the
@@ -431,21 +432,21 @@ IceInternal::Outgoing::finished(BasicStream& is)
             _is.read(unknown, false);
             
             UnknownException* ex;
-            switch(static_cast<DispatchStatus>(status))
+            switch(replyStatus)
             {
-                case DispatchUnknownException:
+                case replyUnknownException:
                 {
                     ex = new UnknownException(__FILE__, __LINE__);
                     break;
                 }
                 
-                case DispatchUnknownLocalException:
+                case replyUnknownLocalException:
                 {
                     ex = new UnknownLocalException(__FILE__, __LINE__);
                     break;
                 }
                 
-                case DispatchUnknownUserException:
+                case replyUnknownUserException:
                 {
                     ex = new UnknownUserException(__FILE__, __LINE__);
                     break;