diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-07-22 13:42:24 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-07-22 13:42:24 +0000 |
| commit | 7989d85c41b78cc5d47a33770534143e3c03e2f8 (patch) | |
| tree | e74f332a41b3c96c95e6f51405c083c2008c81a8 /cppe/src | |
| parent | remove previous ARMv4 exception handling work around. put in new one. (diff) | |
| download | ice-7989d85c41b78cc5d47a33770534143e3c03e2f8.tar.bz2 ice-7989d85c41b78cc5d47a33770534143e3c03e2f8.tar.xz ice-7989d85c41b78cc5d47a33770534143e3c03e2f8.zip | |
Use _M_ARM, put fix on delegate.
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Proxy.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp index b7ba529d129..b24968a5b11 100644 --- a/cppe/src/IceE/Proxy.cpp +++ b/cppe/src/IceE/Proxy.cpp @@ -184,7 +184,7 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; @@ -219,7 +219,7 @@ IceProxy::Ice::Object::ice_ping(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; @@ -254,7 +254,7 @@ IceProxy::Ice::Object::ice_ids(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; @@ -289,7 +289,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; @@ -339,7 +339,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; @@ -584,7 +584,7 @@ IceProxy::Ice::Object::ice_connection() { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && (_M_ARM == 4) // EVC4 SP4 bug. +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. catch(...) { throw; |