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 /cppe/src | |
| 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 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Proxy.cpp | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp index b24968a5b11..5bbc1020906 100644 --- a/cppe/src/IceE/Proxy.cpp +++ b/cppe/src/IceE/Proxy.cpp @@ -184,12 +184,6 @@ IceProxy::Ice::Object::ice_isA(const string& __id, const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } @@ -219,12 +213,6 @@ IceProxy::Ice::Object::ice_ping(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } @@ -254,12 +242,6 @@ IceProxy::Ice::Object::ice_ids(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } @@ -289,12 +271,6 @@ IceProxy::Ice::Object::ice_id(const Context& __context) { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } @@ -339,12 +315,6 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } #endif @@ -584,12 +554,6 @@ IceProxy::Ice::Object::ice_connection() { __handleException(__ex, __cnt); } -#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. - catch(...) - { - throw; - } -#endif } } @@ -775,6 +739,12 @@ IceDelegate::Ice::Object::ice_isA(const string& __id, const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. + catch(...) + { + throw; + } +#endif return __ret; } @@ -800,6 +770,12 @@ IceDelegate::Ice::Object::ice_ping(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. + catch(...) + { + throw; + } +#endif } vector<string> @@ -826,6 +802,12 @@ IceDelegate::Ice::Object::ice_ids(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. + catch(...) + { + throw; + } +#endif return __ret; } @@ -853,6 +835,12 @@ IceDelegate::Ice::Object::ice_id(const Context& __context) { throw ::IceInternal::NonRepeatable(__ex); } +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. + catch(...) + { + throw; + } +#endif return __ret; } @@ -887,6 +875,12 @@ IceDelegate::Ice::Object::ice_invoke(const string& operation, { throw ::IceInternal::NonRepeatable(__ex); } +#if defined(_MSC_VER) && (_MSC_VER == 1201) && defined(_M_ARM) // EVC4 SP4 bug. + catch(...) + { + throw; + } +#endif } return ok; } |