diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-07-13 19:27:26 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-07-13 19:27:26 +0000 |
| commit | 1d56cfac8bc7389c2402041b901078076e9c7ca8 (patch) | |
| tree | 0434a7967400348fb950043189c845a602d5280f | |
| parent | 307fd18cabe9691d922fa18e0db6e42beafbcd73 (diff) | |
| download | ATCD-1d56cfac8bc7389c2402041b901078076e9c7ca8.tar.gz | |
ChangeLogTag: Sat Jul 13 14:26:37 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.cpp | 18 | ||||
| -rw-r--r-- | TAO/tests/POA/Persistent_ID/server.cpp | 16 |
3 files changed, 27 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 280bf05de67..c754a866996 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Sat Jul 13 14:26:37 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/POA/Persistent_ID/server.cpp (method): + * tao/Utils/RIR_Narrow.cpp: Fixed fuzz errors. + Sat Jul 13 13:22:19 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Stack_Recursion/Makefile: diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 7376b253e4b..692beebdd13 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -13,14 +13,17 @@ template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, - char const * id, - CORBA::Environment &ACE_TRY_ENV) + char const * id + ACE_ENV_ARG_DECL) + { CORBA::Object_var object = - orb->resolve_initial_references (id, ACE_TRY_ENV); + orb->resolve_initial_references (id + ACE_ENV_ARG_DECL); ACE_CHECK_RETURN (T::_nil ()); - return RIR_Narrow<T>::narrow_object (object.in (), ACE_TRY_ENV); + return RIR_Narrow<T>::narrow_object (object.in () + ACE_ENV_ARG_PARAMETER); } template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type @@ -33,10 +36,11 @@ TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info, } template<class T> TAO::Utils::RIR_Narrow<T>::_ptr_type -TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object, - CORBA::Environment &ACE_TRY_ENV) +TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object + ACE_ENV_ARG_DECL); { - _var_type narrowed_object = T::_narrow (object, ACE_TRY_ENV); + _var_type narrowed_object = T::_narrow (object + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (T::_nil ()); if (CORBA::is_nil (narrowed_object.in ())) diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index fbf22c2d98d..0f8e8ab1630 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -57,20 +57,26 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::method (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = - this->orb_->resolve_initial_references ("POACurrent"); + this->orb_->resolve_initial_references ("POACurrent" + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; PortableServer::Current_var current = - PortableServer::Current::_narrow (obj.in ()); + PortableServer::Current::_narrow (obj.in () + ACE_ENV_ARG_PARAMETER); + ACE_CHECK; PortableServer::POA_var poa = - current->get_POA (); + current->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; CORBA::String_var poa_name = - poa->the_name (); + poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Method invoked on servant in POA = %s\n", |