diff options
Diffstat (limited to 'TAO/tao/Object.cpp')
| -rw-r--r-- | TAO/tao/Object.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index bb64bcd766e..df57f09aed8 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -17,8 +17,6 @@ #include "IFR_Client_Adapter.h" #include "Remote_Object_Proxy_Broker.h" #include "CDR.h" -#include "SystemException.h" -#include "PolicyC.h" #include "ace/Dynamic_Service.h" #include "ace/OS_NS_string.h" @@ -303,7 +301,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_RETURN (CORBA::INTERNAL ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, EINVAL), CORBA::COMPLETED_NO), 0); @@ -542,7 +540,7 @@ CORBA::Object::_set_policy_overrides ( this->is_collocated_), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( - 0, + TAO_DEFAULT_MINOR_CODE, ENOMEM), CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -928,26 +926,26 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) namespace TAO { CORBA::Object_ptr - Objref_Traits<CORBA::Object>::duplicate (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::tao_duplicate (CORBA::Object_ptr p) { return CORBA::Object::_duplicate (p); } void - Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p) + Objref_Traits<CORBA::Object>::tao_release (CORBA::Object_ptr p) { CORBA::release (p); } CORBA::Object_ptr - Objref_Traits<CORBA::Object>::nil (void) + Objref_Traits<CORBA::Object>::tao_nil (void) { return CORBA::Object::_nil (); } CORBA::Boolean - Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p, - TAO_OutputCDR & cdr) + Objref_Traits<CORBA::Object>::tao_marshal (CORBA::Object_ptr p, + TAO_OutputCDR & cdr) { return p->marshal (cdr); } |