From 0ecb424a94ab5d3d3f72b038cb350d2df295f3cd Mon Sep 17 00:00:00 2001 From: elliott_c Date: Fri, 26 Jan 2007 18:57:11 +0000 Subject: ChangeLogTag: Fri Jan 26 18:56:23 UTC 2007 Chad Elliott --- TAO/ChangeLog | 7 +++++++ TAO/tao/PortableServer/Object_Adapter.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d0b0cbe6be2..b7a731b0573 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Jan 26 18:56:23 UTC 2007 Chad Elliott + + * tao/PortableServer/Object_Adapter.cpp: + + Removed the global scope on the type used in a catch to help vc8 + figure out what to do. + Fri Jan 26 18:45:53 UTC 2007 Chad Elliott * tao/PortableServer/ServantRetentionStrategyRetain.cpp: diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 4cbbd6cf69f..8c854b27170 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -474,7 +474,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name, 1 ); } - catch ( ::PortableServer::POA::AdapterNonExistent&) + catch (const PortableServer::POA::AdapterNonExistent&) { return -1; } -- cgit v1.2.1