diff options
| author | mayur <mayur@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-05 20:52:02 +0000 |
|---|---|---|
| committer | mayur <mayur@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-07-05 20:52:02 +0000 |
| commit | f7136a2a4bf02a8de6a78c656a7ec1f3a8ce2b5e (patch) | |
| tree | 532ab7d67d0cb8bf976a4bb3ab651485dddcb3e6 | |
| parent | d9f37f9b45236a716da7d240e3faa2d9af60cb66 (diff) | |
| download | ATCD-f7136a2a4bf02a8de6a78c656a7ec1f3a8ce2b5e.tar.gz | |
Fri Jul 5 13:50:28 2002 Mayur Deshpande <mayur@ics.uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tests/AMH_Exceptions/server.cpp | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 69568f53869..0a6cf6119d9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 5 13:50:28 2002 Mayur Deshpande <mayur@ics.uci.edu> + + * tests/AMH_Exceptions/server.cpp (start_orb_and_poa): + Fixed Exception macros for no-exception builds. + Fri Jul 5 12:07:07 2002 Carlos O'Ryan <coryan@atdesk.com> * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp: diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index b270e0ca51b..d977681315b 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -44,11 +44,12 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + + ACE_DECLARE_NEW_CORBA_ENV; // Throw an overload exception Test::ServerOverload ts; - Test::AMH_RoundtripExceptionHolder holder (&ts ACE_ENV_ARG_PARAMETER); + Test::AMH_RoundtripExceptionHolder holder (&ts); - ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { _tao_rh->test_method_excep (&holder ACE_ENV_ARG_PARAMETER); @@ -171,6 +172,8 @@ ST_AMH_Server::start_orb_and_poa (void) return -1; } ACE_ENDTRY; + + return 0; } void |