diff options
Diffstat (limited to 'TAO/tao/Object.cpp')
| -rw-r--r-- | TAO/tao/Object.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 5bd3372df1e..41f9149aa42 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -248,7 +248,7 @@ CORBA::Object::_use_locate_requests (CORBA::Boolean use_it) return; } -#if (TAO_HAS_MINIMUM_CORBA == 0) +#if !defined (TAO_HAS_MINIMUM_CORBA) // NON_EXISTENT ... send a simple call to the object, which will // either elicit a FALSE response or a OBJECT_NOT_EXIST exception. In @@ -422,14 +422,12 @@ CORBA_Object::_request (const CORBA::Char *operation, ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Request::_nil ()); } -CORBA::InterfaceDef_ptr +#if (TAO_HAS_INTERFACE_REPOSITORY == 1) + +IR::InterfaceDef_ptr CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) { -#if (TAO_HAS_INTERFACE_REPOSITORY == 1) - CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil(); -#else - CORBA::InterfaceDef_ptr _tao_retval = 0; -#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ + IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil(); TAO_Stub *istub = this->_stubobj (); if (istub == 0) @@ -471,7 +469,6 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) break; } -#if (TAO_HAS_INTERFACE_REPOSITORY == 1) TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (!( (_tao_in >> _tao_retval) @@ -479,12 +476,10 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); return _tao_retval; -#else - ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INTF_REPOS (), _tao_retval); -#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ } +#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */ + CORBA::ImplementationDef_ptr CORBA_Object::_get_implementation (CORBA::Environment &) { @@ -566,7 +561,7 @@ CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies, { inconsistent_policies = 0; -#if (TAO_HAS_MINIMUM_CORBA == 1) +#if defined (TAO_HAS_MINIMUM_CORBA) ACE_UNUSED_ARG (ACE_TRY_ENV); |