From e2bfebbd6f1696703b8a7793552347356b710b67 Mon Sep 17 00:00:00 2001 From: bala Date: Sat, 25 Dec 1999 22:59:58 +0000 Subject: Working version for Param test --- TAO/tao/GIOPC.i | 211 +---------------------------------------- TAO/tao/GIOP_Message_Factory.i | 30 ++++++ TAO/tao/GIOP_Server_Request.i | 54 ++++++++++- TAO/tao/Pluggable_Messaging.i | 2 + 4 files changed, 89 insertions(+), 208 deletions(-) diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i index 6f952b18363..715e79e5e1e 100644 --- a/TAO/tao/GIOPC.i +++ b/TAO/tao/GIOPC.i @@ -224,215 +224,28 @@ GIOP::TargetAddress::_d (void) const } -#if !defined (_GIOP_TARGETADDRESS__TAO_SEQ_OCTET_CI_) -#define _GIOP_TARGETADDRESS__TAO_SEQ_OCTET_CI_ - -// ************************************************************* -// Inline operations for class GIOP::TargetAddress::_tao_seq_Octet_var -// ************************************************************* - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::_tao_seq_Octet_var (GIOP::TargetAddress::_tao_seq_Octet *p) - : ptr_ (p) -{} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::_tao_seq_Octet_var (const GIOP::TargetAddress::_tao_seq_Octet_var &p) // copy constructor -{ - if (p.ptr_) - ACE_NEW (this->ptr_, GIOP::TargetAddress::_tao_seq_Octet (*p.ptr_)); - else - this->ptr_ = 0; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet_var & -GIOP::TargetAddress::_tao_seq_Octet_var::operator= (GIOP::TargetAddress::_tao_seq_Octet *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet_var & -GIOP::TargetAddress::_tao_seq_Octet_var::operator= (const GIOP::TargetAddress::_tao_seq_Octet_var &p) // deep copy -{ - if (this != &p) - { - delete this->ptr_; - ACE_NEW_RETURN (this->ptr_, GIOP::TargetAddress::_tao_seq_Octet (*p.ptr_), *this); - } - return *this; -} - -ACE_INLINE const GIOP::TargetAddress::_tao_seq_Octet * -GIOP::TargetAddress::_tao_seq_Octet_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet * -GIOP::TargetAddress::_tao_seq_Octet_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::operator const GIOP::TargetAddress::_tao_seq_Octet &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::operator GIOP::TargetAddress::_tao_seq_Octet &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_var::operator GIOP::TargetAddress::_tao_seq_Octet &() const// cast -{ - return *this->ptr_; -} - -ACE_INLINE CORBA::Octet & -GIOP::TargetAddress::_tao_seq_Octet_var::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - -ACE_INLINE const GIOP::TargetAddress::_tao_seq_Octet & -GIOP::TargetAddress::_tao_seq_Octet_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet & -GIOP::TargetAddress::_tao_seq_Octet_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet *& -GIOP::TargetAddress::_tao_seq_Octet_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet * -GIOP::TargetAddress::_tao_seq_Octet_var::_retn (void) -{ - GIOP::TargetAddress::_tao_seq_Octet *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet * -GIOP::TargetAddress::_tao_seq_Octet_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class GIOP::TargetAddress::_tao_seq_Octet_out -// ************************************************************* - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_out::_tao_seq_Octet_out (GIOP::TargetAddress::_tao_seq_Octet *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_out::_tao_seq_Octet_out (GIOP::TargetAddress::_tao_seq_Octet_var &p) // constructor from _var - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_out::_tao_seq_Octet_out (const GIOP::TargetAddress::_tao_seq_Octet_out &p) // copy constructor - : ptr_ (ACE_const_cast (GIOP::TargetAddress::_tao_seq_Octet_out&,p).ptr_) -{} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet_out & -GIOP::TargetAddress::_tao_seq_Octet_out::operator= (const GIOP::TargetAddress::_tao_seq_Octet_out &p) -{ - this->ptr_ = ACE_const_cast (GIOP::TargetAddress::_tao_seq_Octet_out&,p).ptr_; - return *this; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet_out & -GIOP::TargetAddress::_tao_seq_Octet_out::operator= (GIOP::TargetAddress::_tao_seq_Octet *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -GIOP::TargetAddress::_tao_seq_Octet_out::operator GIOP::TargetAddress::_tao_seq_Octet *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet *& -GIOP::TargetAddress::_tao_seq_Octet_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet * -GIOP::TargetAddress::_tao_seq_Octet_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE CORBA::Octet & -GIOP::TargetAddress::_tao_seq_Octet_out::operator[] (CORBA::ULong index) -{ - return this->ptr_->operator[] (index); -} - - -#endif /* end #if !defined */ - // accessor to set the member ACE_INLINE void -GIOP::TargetAddress::object_key (const GIOP::TargetAddress::_tao_seq_Octet &val) +GIOP::TargetAddress::object_key (const TAO_ObjectKey &val) { // set the discriminant val this->_reset (0, 0); this->disc_ = 0; ACE_NEW ( this->u_.object_key_, - GIOP::TargetAddress::_tao_seq_Octet (val) + TAO_ObjectKey (val) ); } // readonly get method -ACE_INLINE const GIOP::TargetAddress::_tao_seq_Octet & +ACE_INLINE const TAO_ObjectKey & GIOP::TargetAddress::object_key (void) const { return *this->u_.object_key_; } // read/write get method -ACE_INLINE GIOP::TargetAddress::_tao_seq_Octet & +ACE_INLINE TAO_ObjectKey & GIOP::TargetAddress::object_key (void) { return *this->u_.object_key_; @@ -701,20 +514,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::IORAddressingInf } -#if !defined _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ -#define _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ - -CORBA::Boolean TAO_Export operator<< ( - TAO_OutputCDR &, - const GIOP::TargetAddress::_tao_seq_Octet & - ); -CORBA::Boolean TAO_Export operator>> ( - TAO_InputCDR &, - GIOP::TargetAddress::_tao_seq_Octet & - ); - -#endif /* _TAO_CDR_OP_GIOP_TargetAddress__tao_seq_Octet_I_ */ - ACE_INLINE CORBA::Boolean operator<< ( TAO_OutputCDR &strm, const GIOP::TargetAddress &_tao_union @@ -763,7 +562,7 @@ ACE_INLINE CORBA::Boolean operator>> ( { case 0: { - GIOP::TargetAddress::_tao_seq_Octet _tao_union_tmp; + TAO_ObjectKey _tao_union_tmp; result = strm >> _tao_union_tmp; if (result) _tao_union.object_key (_tao_union_tmp); diff --git a/TAO/tao/GIOP_Message_Factory.i b/TAO/tao/GIOP_Message_Factory.i index ca0908bbcf6..e9742fb7b00 100644 --- a/TAO/tao/GIOP_Message_Factory.i +++ b/TAO/tao/GIOP_Message_Factory.i @@ -1 +1,31 @@ //$Id$ + +// +// Utility routines for the accept states +// + +ACE_INLINE int +TAO_GIOP_Available_States::check_major (CORBA::Octet &major) +{ + // When we have lots we need to move these definitions to the + // GIOP_Accept_State.h file. But for now it is ok.. + if (major != TAO_DEF_GIOP_MAJOR) + { + cout << "Something wrong major"< TAO_DEF_GIOP_MINOR) + { + cout << "Something wrong minor"<operation_.c_str (); } +ACE_INLINE void +TAO_GIOP_ServerRequest::operation (ACE_CString &operation) +{ + this->operation_ = operation; +} // get the length of the operation name. ACE_INLINE unsigned int TAO_GIOP_ServerRequest::operation_length (void) const @@ -53,12 +58,25 @@ TAO_GIOP_ServerRequest::response_expected (void) const return this->response_expected_; } +ACE_INLINE void +TAO_GIOP_ServerRequest:: +response_expected (CORBA::Boolean response) +{ + this->response_expected_ = response; +} + ACE_INLINE CORBA::Boolean TAO_GIOP_ServerRequest::sync_with_server (void) const { return this->sync_with_server_; } +ACE_INLINE void +TAO_GIOP_ServerRequest::sync_with_server (CORBA::Boolean sync_flag) +{ + this->sync_with_server_ = sync_flag; +} + ACE_INLINE void TAO_GIOP_ServerRequest::_tao_lazy_evaluation (int lazy_evaluation) { @@ -71,8 +89,8 @@ TAO_GIOP_ServerRequest::principal (void) const return this->requesting_principal_.ptr (); } -ACE_INLINE const TAO_ObjectKey & -TAO_GIOP_ServerRequest::object_key (void) const +ACE_INLINE TAO_ObjectKey & +TAO_GIOP_ServerRequest::object_key (void) { return this->object_key_; } @@ -93,8 +111,40 @@ TAO_GIOP_ServerRequest::service_info (void) return this->service_info_; } +ACE_INLINE void +TAO_GIOP_ServerRequest:: +service_info (IOP::ServiceContextList &service_info) +{ + this->service_info_ = service_info; +} + ACE_INLINE CORBA::ULong TAO_GIOP_ServerRequest::request_id (void) { return this->request_id_; } + +ACE_INLINE void +TAO_GIOP_ServerRequest::request_id (CORBA::ULong req) +{ + this->request_id_ = req; +} + +ACE_INLINE void +TAO_GIOP_ServerRequest::requesting_principal (CORBA_Principal_ptr + principal) +{ + this->requesting_principal_ = principal; +} + +ACE_INLINE void +TAO_GIOP_ServerRequest::header_length (size_t len) +{ + this->header_len_ = len; +} + +ACE_INLINE void +TAO_GIOP_ServerRequest::message_size_offset (size_t len) +{ + this->message_size_offset_ = len; +} diff --git a/TAO/tao/Pluggable_Messaging.i b/TAO/tao/Pluggable_Messaging.i index ca0908bbcf6..e2024633112 100644 --- a/TAO/tao/Pluggable_Messaging.i +++ b/TAO/tao/Pluggable_Messaging.i @@ -1 +1,3 @@ //$Id$ + + -- cgit v1.2.1