diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-07-22 13:52:21 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-07-22 13:52:21 +0000 |
| commit | 0e09ac0505c473954fd82e02cfa49745fc7b965e (patch) | |
| tree | ea5fddc111ad3057ded060ef81a45b8ba0e871f9 /cpp/src/slice2cppe/Gen.cpp | |
| parent | Use _M_ARM, put fix on delegate. (diff) | |
| download | ice-0e09ac0505c473954fd82e02cfa49745fc7b965e.tar.bz2 ice-0e09ac0505c473954fd82e02cfa49745fc7b965e.tar.xz ice-0e09ac0505c473954fd82e02cfa49745fc7b965e.zip | |
Use _M_ARM, put fix on delegate.
Diffstat (limited to 'cpp/src/slice2cppe/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index a9a31c62193..bb10821b28b 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -1322,18 +1322,6 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sb; C << nl << "__handleException(__ex, __cnt);"; C << eb; - - C.zeroIndent(); - C << nl << "#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug."; // COMPILERBUG - C.restoreIndent(); - C << nl << "catch(...)"; - C << sb; - C << nl << "throw;"; - C << eb; - C.zeroIndent(); - C << nl << "#endif"; - C.restoreIndent(); - C << eb; C << eb; } @@ -1547,6 +1535,18 @@ Slice::Gen::DelegateVisitor::visitOperation(const OperationPtr& p) C << sb; C << nl << "throw ::IceInternal::NonRepeatable(__ex);"; C << eb; + + C.zeroIndent(); + C << nl << "#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug."; // COMPILERBUG + C.restoreIndent(); + C << nl << "catch(...)"; + C << sb; + C << nl << "throw;"; + C << eb; + C.zeroIndent(); + C << nl << "#endif"; + C.restoreIndent(); + C << eb; } |