summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Exception.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2008-01-23 09:15:28 -0500
committerBernard Normier <bernard@zeroc.com>2008-01-23 09:15:28 -0500
commit2cdd39227e7efda5fc8b3a04a9c2b0d678943a17 (patch)
treeac7d3ef0ae27a80cc2bc1f4a2c7f42c52d35e979 /cpp/src/Ice/Exception.cpp
parentNew VC60 third-party build + VC60 build fixes (diff)
parent- Added IceUtil::SyscallException and cleaned up few IceUtil exceptions (diff)
downloadice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.tar.bz2
ice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.tar.xz
ice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.zip
Merge branch 'master' of ssh://cvs/home/git/ice
Diffstat (limited to 'cpp/src/Ice/Exception.cpp')
-rw-r--r--cpp/src/Ice/Exception.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 7b7a87f746c..651c9f7277d 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -262,7 +262,7 @@ Ice::SyscallException::ice_print(ostream& out) const
Exception::ice_print(out);
if(error != 0)
{
- out << ":\nsyscall exception: " << errorToString(error);
+ out << ":\nsyscall exception: " << IceUtilInternal::errorToString(error);
}
}
@@ -277,7 +277,7 @@ Ice::SocketException::ice_print(ostream& out) const
}
else
{
- out << errorToString(error);
+ out << IceUtilInternal::errorToString(error);
}
}
@@ -292,7 +292,7 @@ Ice::FileException::ice_print(ostream& out) const
}
else
{
- out << errorToString(error);
+ out << IceUtilInternal::errorToString(error);
}
if(!path.empty())
{
@@ -304,14 +304,14 @@ void
Ice::ConnectFailedException::ice_print(ostream& out) const
{
Exception::ice_print(out);
- out << ":\nconnect failed: " << errorToString(error);
+ out << ":\nconnect failed: " << IceUtilInternal::errorToString(error);
}
void
Ice::ConnectionRefusedException::ice_print(ostream& out) const
{
Exception::ice_print(out);
- out << ":\nconnection refused: " << errorToString(error);
+ out << ":\nconnection refused: " << IceUtilInternal::errorToString(error);
}
void
@@ -325,7 +325,7 @@ Ice::ConnectionLostException::ice_print(ostream& out) const
}
else
{
- out << errorToString(error);
+ out << IceUtilInternal::errorToString(error);
}
}