summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Outgoing.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-11-16 14:55:39 -0500
committerBernard Normier <bernard@zeroc.com>2007-11-16 14:55:39 -0500
commit4a8b144491d9f66a45a0cbdd651a8c785d6fb728 (patch)
treeba1fa5e6a6898627784289c0859461c0c6c0bf0f /cpp/src/Ice/Outgoing.cpp
parentMakefile update (diff)
parentAdded AMI tests (diff)
downloadice-4a8b144491d9f66a45a0cbdd651a8c785d6fb728.tar.bz2
ice-4a8b144491d9f66a45a0cbdd651a8c785d6fb728.tar.xz
ice-4a8b144491d9f66a45a0cbdd651a8c785d6fb728.zip
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/Ice/Outgoing.cpp')
-rw-r--r--cpp/src/Ice/Outgoing.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 53c333ba5f8..a46a4e9b0bb 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -67,8 +67,12 @@ IceInternal::LocalExceptionWrapper::throwUnknownWrapper(const std::exception& ex
throw LocalExceptionWrapper(*le, false);
#endif
}
+#if 0
string msg = "std::exception: ";
throw LocalExceptionWrapper(UnknownException(__FILE__, __LINE__, msg + ex.what()), false);
+#else
+ throw ex;
+#endif
}
const LocalException*