diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-26 18:57:11 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-26 18:57:11 +0000 |
| commit | 0ecb424a94ab5d3d3f72b038cb350d2df295f3cd (patch) | |
| tree | 7d81a575fc1bfc294607d28443909c094c39f46c | |
| parent | a2bb52684c260ad4d6deb0aca845e88957802a8f (diff) | |
| download | ATCD-0ecb424a94ab5d3d3f72b038cb350d2df295f3cd.tar.gz | |
ChangeLogTag: Fri Jan 26 18:56:23 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
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 <elliott_c@ociweb.com> + + * 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 <elliott_c@ociweb.com> * 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; } |