diff options
author | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2008-04-03 12:36:57 +1000 |
commit | 27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc (patch) | |
tree | 4d825c1cb800b154ea4b33b238027f1ff9a13531 /cpp/src/slice2cpp/Gen.cpp | |
parent | Fixed comment for GCShared (wrong namespace). (diff) | |
parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
download | ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.bz2 ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.tar.xz ice-27a24cf07fa7646c5a27cbbfb60d6e4a86184ebc.zip |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rwxr-xr-x | cpp/src/slice2cpp/Gen.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index ddf90893d2b..85662dff609 100755 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2694,7 +2694,12 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) } C << nl << "catch(const ::Ice::UserException& __ex)"; C << sb; - C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());"; + // + // COMPILERFIX: Don't throw UnknownUserException directly. This is causing access + // violation errors with Visual C++ 64bits optimized builds. See bug #2962. + // + C << nl << "::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());"; + C << nl << "throw __uue;"; C << eb; C << eb; |