summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/Server.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/IcePatch2/Server.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/IcePatch2/Server.cpp')
-rw-r--r--cpp/src/IcePatch2/Server.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2/Server.cpp b/cpp/src/IcePatch2/Server.cpp
index 35fe7589e48..2e34440611a 100644
--- a/cpp/src/IcePatch2/Server.cpp
+++ b/cpp/src/IcePatch2/Server.cpp
@@ -8,6 +8,7 @@
// **********************************************************************
#include <IceUtil/Options.h>
+#include <IceUtil/StringUtil.h>
#include <Ice/Service.h>
#include <IcePatch2/FileServerI.h>
#include <IcePatch2/Util.h>
@@ -122,7 +123,7 @@ IcePatch2::PatcherService::start(int argc, char* argv[])
string cwd;
if(OS::getcwd(cwd) != 0)
{
- throw "cannot get the current directory:\n" + lastError();
+ throw "cannot get the current directory:\n" + IceUtilInternal::lastErrorToString();
}
dataDir = cwd + '/' + dataDir;