diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-16 06:04:44 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-16 06:04:44 +0000 |
commit | 5f000af476f16d8687ffc7deb9795b884c5b44f2 (patch) | |
tree | e777e4e2362697a994aa8fa0b44ce7ee27294180 /TAO/tao | |
parent | 672f8d3db0d7171d1e6d4dc2d6e6772c0ba830aa (diff) | |
download | ATCD-5f000af476f16d8687ffc7deb9795b884c5b44f2.tar.gz |
ChangeLogTag:Wed Mar 15 23:56:37 2000 Nanbor Wang <nanbor@cs.wustl.edu>
Diffstat (limited to 'TAO/tao')
-rw-r--r-- | TAO/tao/IIOP_Transport.cpp | 29 | ||||
-rw-r--r-- | TAO/tao/UIOP_Transport.cpp | 22 |
2 files changed, 24 insertions, 27 deletions
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 949ae2937ac..186e1af7b5b 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -150,7 +150,7 @@ TAO_IIOP_Client_Transport::client_handler (void) } void -TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, +TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/, TAO_Target_Specification & /*spec */, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV) @@ -168,13 +168,13 @@ TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, output, orb_core) == 0)*/ if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_REQUEST, + (TAO_PLUGGABLE_MESSAGE_REQUEST, output) == 0) ACE_THROW (CORBA::MARSHAL ()); } void -TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core */*orb_core*/, +TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/, TAO_Target_Specification &spec, TAO_Operation_Details &opdetails, TAO_OutputCDR &output, @@ -182,14 +182,14 @@ TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core */*orb_core*/, ACE_THROW_SPEC ((CORBA::SystemException)) { // See this is GIOP way of doing this..But anyway IIOP will be tied - // up with GIOP. + // up with GIOP. if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, + (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, output) == 0) ACE_THROW (CORBA::MARSHAL ()); - + if (this->client_mesg_factory_->write_message_header (opdetails, - TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, + TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER, spec, output) == 0) ACE_THROW (CORBA::MARSHAL ()); @@ -316,7 +316,7 @@ TAO_IIOP_Client_Transport::register_handler (void) } int -TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major, +TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major, CORBA::Octet minor) { if (this->client_mesg_factory_ == 0) @@ -357,12 +357,12 @@ TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major, if (TAO_debug_level > 0) { ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), + ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 0); } } } - + return 1; } @@ -373,12 +373,12 @@ TAO_IIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails { // We are going to pass on this request to the underlying messaging // layer. It should take care of this request - CORBA::Boolean retval = + CORBA::Boolean retval = this->client_mesg_factory_->write_message_header (opdetails, - TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, + TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, spec, msg); - + return retval; } @@ -454,7 +454,7 @@ TAO_IIOP_Transport::send_request (TAO_Stub *, } - + CORBA::Boolean TAO_IIOP_Transport::send_request_header (TAO_Operation_Details & /**/, TAO_Target_Specification & /*spec */ , @@ -463,4 +463,3 @@ TAO_IIOP_Transport::send_request_header (TAO_Operation_Details & /**/, // We should never be here. So return an error. return 0; } - diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp index 8137513472f..5dd43f1a86c 100644 --- a/TAO/tao/UIOP_Transport.cpp +++ b/TAO/tao/UIOP_Transport.cpp @@ -152,7 +152,7 @@ TAO_UIOP_Client_Transport::client_handler (void) } void -TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, +TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/, TAO_Target_Specification & /*spec*/, TAO_OutputCDR &output, CORBA::Environment &ACE_TRY_ENV) @@ -166,7 +166,7 @@ TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/, // @@ This should be implemented in the transport object, which // would query the profile to obtain the version... if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_REQUEST, + (TAO_PLUGGABLE_MESSAGE_REQUEST, output) == 0) ACE_THROW (CORBA::MARSHAL ()); } @@ -188,7 +188,7 @@ TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/, // @@ This should be implemented in the transport object, which // would query the profile to obtain the version... if (this->client_mesg_factory_->write_protocol_header - (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, + (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, output) == 0) ACE_THROW (CORBA::MARSHAL ()); @@ -323,9 +323,9 @@ TAO_UIOP_Client_Transport::register_handler (void) int TAO_UIOP_Client_Transport:: - messaging_init (CORBA::Octet major, - CORBA::Octet minor) -{ + messaging_init (CORBA::Octet major, + CORBA::Octet minor) +{ if (this->client_mesg_factory_ == 0) { if (this->lite_flag_) @@ -364,15 +364,15 @@ TAO_UIOP_Client_Transport:: if (TAO_debug_level > 0) { ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), + ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 0); } } } - + return 1; } - + CORBA::Boolean TAO_UIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails, @@ -381,7 +381,7 @@ TAO_UIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails { // We are going to pass on this request to the underlying messaging // layer. It should take care of this request - CORBA::Boolean retval = + CORBA::Boolean retval = this->client_mesg_factory_->write_message_header (opdetails, TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER, spec, @@ -469,5 +469,3 @@ TAO_UIOP_Transport::send_request_header (TAO_Operation_Details & /*opdetails*/, } #endif /* TAO_HAS_UIOP */ - - |