summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Exception.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-04-18 14:33:16 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-04-18 14:33:16 +0200
commit2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch)
tree0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Ice/Exception.cpp
parentICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff)
downloadice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2
ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz
ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
-rw-r--r--cpp/src/Ice/Exception.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index a6b77505c5d..6e81344679f 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -191,6 +191,13 @@ Ice::EndpointSelectionTypeParseException::ice_print(ostream& out) const
}
void
+Ice::VersionParseException::ice_print(ostream& out) const
+{
+ Exception::ice_print(out);
+ out << ":\nerror while parsing version `" << str << "'";
+}
+
+void
Ice::IdentityParseException::ice_print(ostream& out) const
{
Exception::ice_print(out);
@@ -418,16 +425,16 @@ void
Ice::UnsupportedProtocolException::ice_print(ostream& out) const
{
Exception::ice_print(out);
- out << ":\nprotocol error: unsupported protocol version: " << badMajor << "." << badMinor;
- out << "\n(can only support protocols compatible with version " << major << "." << minor << ")";
+ out << ":\nprotocol error: unsupported protocol version: " << bad;
+ out << "\n(can only support protocols compatible with version " << supported << ")";
}
void
Ice::UnsupportedEncodingException::ice_print(ostream& out) const
{
Exception::ice_print(out);
- out << ":\nprotocol error: unsupported encoding version: " << badMajor << "." << badMinor;
- out << "\n(can only support encodings compatible with version " << major << "." << major << ")";
+ out << ":\nprotocol error: unsupported encoding version: " << bad;
+ out << "\n(can only support encodings compatible with version " << supported << ")";
if(!reason.empty())
{
out << "\n" << reason;