diff options
| author | edwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-29 02:23:46 +0000 |
|---|---|---|
| committer | edwardgt <edwardgt@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-08-29 02:23:46 +0000 |
| commit | ba6ec881dff19a91d7382b85cb3863e6626f5e33 (patch) | |
| tree | eb859552b05eeaa0b15023c11a4a145211d159e9 | |
| parent | ccf758a1140e944ae45bbe12ff60ad3d5be356b3 (diff) | |
| download | ATCD-ba6ec881dff19a91d7382b85cb3863e6626f5e33.tar.gz | |
ChangeLogTag: Thu Aug 28 19:15:44 2003 George Edwards <g.edwards@vanderbilt.edu>
4 files changed, 12 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1bbe92c9b5b..349f4f03126 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 28 19:15:44 2003 George Edwards <g.edwards@vanderbilt.edu> + + * tests/Portable_Interceptors/Bug_1559/interceptors.cpp: + * tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp: + * tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp: + + Fixed compilation errors related to misused ACE error handling macros. + Thu Aug 28 18:35:44 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/Acceptor_Impl.cpp: diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp index d1dd1b1eb17..17378987f11 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp @@ -82,8 +82,7 @@ Echo_Client_Request_Interceptor::send_request ( operation.in (), ior.in ())); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + ACE_TRY_NEW_ENV { ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -608,7 +607,7 @@ Echo_Server_Request_Interceptor::send_other ( ACE_DEBUG ((LM_DEBUG, "%s.send_other from \"%s\"\n", this->myname_, - ri->operation ())); + operation.in ())); // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc = diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 36ce3c1b962..0fc7bc7448f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -49,6 +49,5 @@ Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->_remove_ref (); - this->orb_->shutdown (1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp index 7eab65a9333..ec7fd64aa26 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp @@ -3,7 +3,7 @@ // #include "Client_Task.h" -#include "TestC.h" +#include "testC.h" ACE_RCSID(Muxing, Client_Task, "$Id$") |