exception fix

1 files changed, 43 insertions, 36 deletions

diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 37582d7c2b4..ae8b67ffaaf 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -191,129 +191,136 @@ Ice::ProtocolException::ice_print(ostream& out) const
 }
 
 void
-Ice::UnmarshalException::ice_print(ostream& out) const
+Ice::UnsupportedProtocolException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: error during unmarshaling";
+    out << ":\nprotocol error: unsupported protocol version";
 }
 
 void
-Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
+Ice::UnsupportedEncodingException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: out of bounds during unmarshaling";
+    out << ":\nprotocol error: unsupported encoding version";
 }
 
 void
-Ice::NoObjectFactoryException::ice_print(ostream& out) const
+Ice::UnknownMessageException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: no suitable object factory found";
+    out << ":\nprotocol error: unknown message type";
 }
 
 void
-Ice::NoUserExceptionFactoryException::ice_print(ostream& out) const
+Ice::UnknownRequestIdException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: no suitable user exception factory found";
+    out << ":\nprotocol error: unknown request id";
 }
 
 void
-Ice::ProxyUnmarshalException::ice_print(ostream& out) const
+Ice::UnknownReplyStatusException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: inconsistent proxy data during unmarshaling";
+    out << ":\nprotocol error: unknown reply status";
 }
 
 void
-Ice::IllegalIndirectionException::ice_print(ostream& out) const
+Ice::CloseConnectionException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: encountered illegal protocol indirection";
+    out << ":\nprotocol error: connection closed";
 }
 
 void
-Ice::MemoryLimitException::ice_print(ostream& out) const
+Ice::AbortBatchRequestException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: memory limit exceeded";
+    out << ":\nprotocol error: batch request was aborted";
 }
 
 void
-Ice::EncapsulationException::ice_print(ostream& out) const
+Ice::IllegalMessageSizeException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: illegal encapsulation";
+    out << ":\nprotocol error: illegal message size";
 }
 
 void
-Ice::UnsupportedProtocolException::ice_print(ostream& out) const
+Ice::CompressionNotSupportedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unsupported protocol version";
+    out << ":\nprotocol error: compressed messages not supported";
 }
 
 void
-Ice::UnsupportedEncodingException::ice_print(ostream& out) const
+Ice::CompressionException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unsupported encoding version";
+    out << ":\nprotocol error: failed to compress or uncompress data";
 }
 
 void
-Ice::UnknownMessageException::ice_print(ostream& out) const
+Ice::MarshalException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unknown message type";
+    out << ":\nprotocol error: error during unmarshaling";
 }
 
 void
-Ice::UnknownRequestIdException::ice_print(ostream& out) const
+Ice::NoObjectFactoryException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unknown request id";
+    out << ":\nprotocol error: no suitable object factory found";
 }
 
 void
-Ice::UnknownReplyStatusException::ice_print(ostream& out) const
+Ice::NoUserExceptionFactoryException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unknown reply status";
+    out << ":\nprotocol error: no suitable user exception factory found";
 }
 
 void
-Ice::CloseConnectionException::ice_print(ostream& out) const
+Ice::UnmarshalOutOfBoundsException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: connection closed";
+    out << ":\nprotocol error: out of bounds during unmarshaling";
 }
 
 void
-Ice::AbortBatchRequestException::ice_print(ostream& out) const
+Ice::ProxyUnmarshalException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: batch request was aborted";
+    out << ":\nprotocol error: inconsistent proxy data during unmarshaling";
 }
 
 void
-Ice::IllegalMessageSizeException::ice_print(ostream& out) const
+Ice::IllegalIndirectionException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: illegal message size";
+    out << ":\nprotocol error: encountered illegal protocol indirection";
 }
 
 void
-Ice::CompressionNotSupportedException::ice_print(ostream& out) const
+Ice::MemoryLimitException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: compressed messages not supported";
+    out << ":\nprotocol error: memory limit exceeded";
 }
 
 void
-Ice::CompressionException::ice_print(ostream& out) const
+Ice::EncapsulationException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: failed to compress or uncompress data";
+    out << ":\nprotocol error: illegal encapsulation";
+}
+
+void
+Ice::NegativeSizeException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nprotocol error: negative size for sequence, dictionary, etc.";
 }
 
 void