diff options
Diffstat (limited to 'TAO/tao/PolicyC.cpp')
| -rw-r--r-- | TAO/tao/PolicyC.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 52122bd6f7d..b41282d2744 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -194,7 +194,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow ( CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow ( CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV + CORBA::Environment & ) { if (CORBA::is_nil (obj)) @@ -205,14 +205,11 @@ CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow ( if (obj->_is_collocated () && obj->_servant() != 0) servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0"); if (servant == 0) - { #if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ()); #else - ACE_UNUSED_ARG (ACE_TRY_ENV); - return new CORBA_Policy(stub); + return new CORBA_Policy(stub); #endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - } return new POA_CORBA::_tao_collocated_Policy( ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant), stub |