Split DispatchStatus into dispatch status and reply status (bug #2150)

1 files changed, 21 insertions, 20 deletions

diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index cc89bf153ee..cb371f4e35a 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -17,6 +17,7 @@
 #include <Ice/Logger.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Protocol.h>
+#include <Ice/ReplyStatus.h>
 #include <set>
 
 using namespace std;
@@ -292,42 +293,42 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const Logge
         stream.read(requestId);
         s << "\nrequest id = " << requestId;
 
-        Byte status;
-        stream.read(status);
-        s << "\nreply status = " << static_cast<int>(status) << ' ';
-        switch(static_cast<DispatchStatus>(status))
+        Byte replyStatus;
+        stream.read(replyStatus);
+        s << "\nreply status = " << static_cast<int>(replyStatus) << ' ';
+        switch(replyStatus)
         {
-            case DispatchOK:
+            case replyOK:
             {
                 s << "(ok)";
                 break;
             }
 
-            case DispatchUserException:
+            case replyUserException:
             {
                 s << "(user exception)";
                 break;
             }
 
-            case DispatchObjectNotExist:
-            case DispatchFacetNotExist:
-            case DispatchOperationNotExist:
+            case replyObjectNotExist:
+            case replyFacetNotExist:
+            case replyOperationNotExist:
             {
-                switch(static_cast<DispatchStatus>(status))
+                switch(replyStatus)
                 {
-                    case DispatchObjectNotExist:
+                    case replyObjectNotExist:
                     {
                         s << "(object not exist)";
                         break;
                     }
 
-                    case DispatchFacetNotExist:
+                    case replyFacetNotExist:
                     {
                         s << "(facet not exist)";
                         break;
                     }
 
-                    case DispatchOperationNotExist:
+                    case replyOperationNotExist:
                     {
                         s << "(operation not exist)";
                         break;
@@ -344,25 +345,25 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const Logge
                 break;
             }
 
-            case DispatchUnknownException:
-            case DispatchUnknownLocalException:
-            case DispatchUnknownUserException:
+            case replyUnknownException:
+            case replyUnknownLocalException:
+            case replyUnknownUserException:
             {
-                switch(static_cast<DispatchStatus>(status))
+                switch(replyStatus)
                 {
-                    case DispatchUnknownException:
+                    case replyUnknownException:
                     {
                         s << "(unknown exception)";
                         break;
                     }
 
-                    case DispatchUnknownLocalException:
+                    case replyUnknownLocalException:
                     {
                         s << "(unknown local exception)";
                         break;
                     }
 
-                    case DispatchUnknownUserException:
+                    case replyUnknownUserException:
                     {
                         s << "(unknown user exception)";
                         break;