diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-04-04 09:55:15 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-04-04 09:55:15 -0230 |
| commit | eac6b3e8cca36264f6a3ba3bafb365ef58fb1783 (patch) | |
| tree | 230ddea5d84c41897ee1d48ac19fc4ea0df0a0db /cpp/src/Ice/ConnectionRequestHandler.cpp | |
| parent | Bug 2991 - installation of policy files (previous changed didn't work for GAC... (diff) | |
| download | ice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.tar.bz2 ice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.tar.xz ice-eac6b3e8cca36264f6a3ba3bafb365ef58fb1783.zip | |
Port to CodeGear C++Builder 2007
Diffstat (limited to 'cpp/src/Ice/ConnectionRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionRequestHandler.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp index d65e9fd449c..44d004fd2da 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.cpp +++ b/cpp/src/Ice/ConnectionRequestHandler.cpp @@ -21,7 +21,19 @@ using namespace IceInternal; ConnectionRequestHandler::ConnectionRequestHandler(const ReferencePtr& reference, const Ice::ObjectPrx& proxy) : RequestHandler(reference) { - _connection = _reference->getConnection(_compress); +// COMPILERFIX: Without the catch/rethrow C++Builder 2007 can get access violations. +#ifdef __BCPLUSPLUS__ + try + { +#endif + _connection = _reference->getConnection(_compress); +#ifdef __BCPLUSPLUS__ + } + catch(const Ice::LocalException&) + { + throw; + } +#endif RouterInfoPtr ri = reference->getRouterInfo(); if(ri) { |