summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Application.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-12-21 15:25:37 -0500
committerBernard Normier <bernard@zeroc.com>2007-12-21 15:25:37 -0500
commite099cd4fd77c718f9c241ad609f5aa7a80627ba8 (patch)
tree998305e426f74429b00122dcdc4f839e2f97ade5 /cpp/src/Ice/Application.cpp
parentIceUtil cleanup (first commit) (diff)
parentFix bug 2520: Test suite unsets ICE_CONFIG to avoid configuration conflicts (diff)
downloadice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.bz2
ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.tar.xz
ice-e099cd4fd77c718f9c241ad609f5aa7a80627ba8.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Conflicts: cpp/src/Slice/VbUtil.cpp
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
-rw-r--r--cpp/src/Ice/Application.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index c28bfac02f1..1e84d1f4957 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -652,7 +652,7 @@ Ice::Application::mainInternal(int argc, char* argv[], const InitializationData&
}
catch(const std::exception& ex)
{
- cerr << _appName << ex.what() << endl;
+ cerr << _appName << ": " << ex.what() << endl;
status = EXIT_FAILURE;
}
catch(...)