diff options
Diffstat (limited to 'TAO/tao/Utils')
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.cpp | 29 | ||||
| -rw-r--r-- | TAO/tao/Utils/RIR_Narrow.h | 10 | ||||
| -rw-r--r-- | TAO/tao/Utils/Synch_Refcountable.cpp | 3 |
3 files changed, 13 insertions, 29 deletions
diff --git a/TAO/tao/Utils/RIR_Narrow.cpp b/TAO/tao/Utils/RIR_Narrow.cpp index 6d5fe007366..ebc014d499e 100644 --- a/TAO/tao/Utils/RIR_Narrow.cpp +++ b/TAO/tao/Utils/RIR_Narrow.cpp @@ -10,42 +10,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type -TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, - char const * id - ) +TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb, char const * id) { CORBA::Object_var object = - orb->resolve_initial_references (id - ); + orb->resolve_initial_references (id); - return RIR_Narrow<T>::narrow_object (object.in () - ); + return RIR_Narrow<T>::narrow_object (object.in ()); } template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type TAO::Utils::RIR_Narrow<T>::narrow (PortableInterceptor::ORBInitInfo_ptr info, - char const * id - ) + char const * id) { - CORBA::Object_var object = - info->resolve_initial_references (id - ); + CORBA::Object_var object = info->resolve_initial_references (id); - return RIR_Narrow<T>::narrow_object (object.in () - ); + return RIR_Narrow<T>::narrow_object (object.in ()); } template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type -TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object - ) +TAO::Utils::RIR_Narrow<T>::narrow_object (CORBA::Object_ptr object) { - _var_type narrowed_object = T::_narrow (object - ); + _var_type narrowed_object = T::_narrow (object); if (CORBA::is_nil (narrowed_object.in ())) { - ACE_THROW_RETURN (CORBA::INV_OBJREF (), - T::_nil ()); + throw ::CORBA::INV_OBJREF (); } return narrowed_object._retn (); } diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h index 8afa8931e41..8e986e6d654 100644 --- a/TAO/tao/Utils/RIR_Narrow.h +++ b/TAO/tao/Utils/RIR_Narrow.h @@ -45,19 +45,15 @@ namespace TAO /// Use resolve_initial_references to find an object and then /// narrow it. - static _ptr_type narrow (CORBA::ORB_ptr orb, - char const * id - ); + static _ptr_type narrow (CORBA::ORB_ptr orb, char const * id); /// Use resolve_initial_references to find an object and then /// narrow it. static _ptr_type narrow (PortableInterceptor::ORBInitInfo_ptr orb, - char const * id - ); + char const * id); private: - static _ptr_type narrow_object (CORBA::Object_ptr object - ); + static _ptr_type narrow_object (CORBA::Object_ptr object); }; } // namespace Utils diff --git a/TAO/tao/Utils/Synch_Refcountable.cpp b/TAO/tao/Utils/Synch_Refcountable.cpp index 4b132799b70..44f0b01c19d 100644 --- a/TAO/tao/Utils/Synch_Refcountable.cpp +++ b/TAO/tao/Utils/Synch_Refcountable.cpp @@ -13,8 +13,7 @@ ACE_RCSID (Utils, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, - int refcount) +TAO_Synch_Refcountable::TAO_Synch_Refcountable (ACE_Lock *lock, int refcount) : ACE_Refcountable (refcount) , refcount_lock_ (lock) { |