diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-12-17 20:05:04 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-12-17 20:05:04 +0000 |
commit | 8b8df518585993f0c611564192b06a0404f0ccd2 (patch) | |
tree | 8e6125d21ce57bf003c4d0851257d1febd711388 | |
parent | 6ae14f3ab842981013967a942259b6bdd21fd404 (diff) | |
download | ATCD-8b8df518585993f0c611564192b06a0404f0ccd2.tar.gz |
Mon Dec 17 20:02:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
28 files changed, 141 insertions, 109 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ec8392387e8..c0361673f99 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,47 @@ +Mon Dec 17 20:02:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp + * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h + * tao/IIOP_Transport.cpp + * tao/IIOP_Transport.h + * tao/Strategies/COIOP_Transport.cpp + * tao/Strategies/COIOP_Transport.h + * tao/Strategies/DIOP_Transport.cpp + * tao/Strategies/DIOP_Transport.h + * tao/Strategies/SCIOP_Transport.cpp + * tao/Strategies/SCIOP_Transport.h + * tao/Strategies/SHMIOP_Transport.cpp + * tao/Strategies/SHMIOP_Transport.h + * tao/Strategies/UIOP_Transport.cpp + * tao/Strategies/UIOP_Transport.h + * tao/Transport.cpp + * tao/Transport.h + Changed message_semantics to a real enum, this fixes bugzilla + 2992 + + * tao/Bind_Dispatcher_Guard.h: + * tao/Bind_Dispatcher_Guard.inl: + Changed status to TAO_Bind_Dispatcher_Status instead of int + + * tao/IIOP_Connection_Handler.cpp: + Const changes + + * tao/ORB.cpp: + Use true/false instead of 1/0 + + * tao/ORB.h: + Documentation change + + * tao/ORB_Core.cpp: + Layout change + + * tao/Resume_Handle.h: + Doxygen change + Mon Dec 17 16:39:01 UTC 2007 Adam Mitz <mitza@ociweb.com> * tao/CSD_ThreadPool/CSD_TP_Task.cpp: diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp index 43cb5a7a164..57fd368c2dd 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp @@ -141,7 +141,7 @@ int TAO::HTIOP::Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, @@ -162,9 +162,9 @@ TAO::HTIOP::Transport::send_request (TAO_Stub *stub, int TAO::HTIOP::Transport::send_message (TAO_OutputCDR &stream, - TAO_Stub *stub, - int message_semantics, - ACE_Time_Value *max_wait_time) + TAO_Stub *stub, + TAO_Message_Semantics message_semantics, + ACE_Time_Value *max_wait_time) { // Format the message in the stream first if (this->messaging_object_->format_message (stream) != 0) @@ -195,7 +195,7 @@ TAO::HTIOP::Transport::send_message (TAO_OutputCDR &stream, int TAO::HTIOP::Transport::send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { @@ -217,8 +217,8 @@ TAO::HTIOP::Transport::send_message_shared (TAO_Stub *stub, int TAO::HTIOP::Transport::generate_request_header (TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg) + TAO_Target_Specification &spec, + TAO_OutputCDR &msg) { // Check whether we have a Bi Dir HTIOP policy set, whether the // messaging objects are ready to handle bidirectional connections diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h index 30e5b313f77..4c806b28a28 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h @@ -99,7 +99,7 @@ namespace TAO virtual int register_handler (void); virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -110,12 +110,12 @@ namespace TAO virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = + TAO_Message_Semantics message_semantics = Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp index 481c035d6b6..6ae4bf66180 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp @@ -541,7 +541,7 @@ int TAO_UIPMC_Transport<CONNECTION_HANDLER>::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, @@ -562,7 +562,7 @@ template<typename CONNECTION_HANDLER> int TAO_UIPMC_Transport<CONNECTION_HANDLER>::send_message (TAO_OutputCDR &stream, TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { // Format the message in the stream first diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h index 1349e013c4b..1508ef5380e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h @@ -82,12 +82,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); //@} diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index 9628b5b66a0..bf1594f9bbd 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -118,7 +118,7 @@ int TAO::SSLIOP::Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, message_semantics) == -1) @@ -137,7 +137,7 @@ TAO::SSLIOP::Transport::send_request (TAO_Stub *stub, int TAO::SSLIOP::Transport::send_message (TAO_OutputCDR &stream, TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { // Format the message in the stream first diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h index 68e7f6edf29..02f559cf56d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h @@ -102,12 +102,12 @@ namespace TAO virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index ca4d11eb4e5..ec68893ba66 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -37,7 +37,7 @@ public: int unbind_dispatcher (void); /// State information - enum + enum TAO_Bind_Dispatcher_Status { /// Unbind the dispatcher UNBIND = 0, @@ -46,13 +46,13 @@ public: }; /// Get status - int status (void) const; + TAO_Bind_Dispatcher_Status status (void) const; /// Set status - void status (int status); + void status (TAO_Bind_Dispatcher_Status status); private: - int status_; + TAO_Bind_Dispatcher_Status status_; CORBA::ULong request_id_; TAO_Reply_Dispatcher* rd_; TAO_Transport_Mux_Strategy* tms_; diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl index c4a3477f7ee..e7e069797e4 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.inl +++ b/TAO/tao/Bind_Dispatcher_Guard.inl @@ -19,12 +19,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_Bind_Dispatcher_Guard::status (int s) +TAO_Bind_Dispatcher_Guard::status (TAO_Bind_Dispatcher_Status s) { this->status_ = s; } -ACE_INLINE int +ACE_INLINE TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Status TAO_Bind_Dispatcher_Guard::status (void) const { return this->status_; diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 9a3a02f3448..67f73e5c00c 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -297,8 +297,7 @@ TAO_IIOP_Connection_Handler::handle_input (ACE_HANDLE h) int TAO_IIOP_Connection_Handler::handle_output (ACE_HANDLE handle) { - const int result = - this->handle_output_eh (handle, this); + int const result = this->handle_output_eh (handle, this); if (result == -1) { @@ -336,8 +335,7 @@ TAO_IIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &, } int -TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE, - ACE_Reactor_Mask) +TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) { ACE_ASSERT (0); return 0; @@ -376,8 +374,7 @@ TAO_IIOP_Connection_Handler::add_transport_to_cache (void) this->orb_core ()->lane_resources ().transport_cache (); // Idle the transport.. - return cache.cache_idle_transport (&prop, - this->transport ()); + return cache.cache_idle_transport (&prop, this->transport ()); } int @@ -385,7 +382,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( IIOP::ListenPointList &listen_list) { // Get the size of the list - const CORBA::ULong len = listen_list.length (); + CORBA::ULong const len = listen_list.length (); if (TAO_debug_level > 0 && len == 0) { @@ -426,11 +423,8 @@ TAO_IIOP_Connection_Handler::process_listen_point_list ( // The property for this handler has changed. Recache the // handler with this property - int retval = - this->transport ()->recache_transport (&prop); - - if (retval == -1) - return retval; + if (this->transport ()->recache_transport (&prop) == -1) + return -1; // Make the handler idle and ready for use this->transport ()->make_idle (); @@ -517,8 +511,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio if (tph != 0) { - CORBA::Long codepoint = - tph->get_dscp_codepoint (); + CORBA::Long codepoint = tph->get_dscp_codepoint (); tos = static_cast<int> (codepoint) << 2; this->set_tos (tos); diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 73cda6a4521..45e441d8f87 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -208,7 +208,7 @@ int TAO_IIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, message_semantics) == -1) @@ -228,7 +228,7 @@ TAO_IIOP_Transport::send_request (TAO_Stub *stub, int TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream, TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { // Format the message in the stream first @@ -261,7 +261,7 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream, int TAO_IIOP_Transport::send_message_shared ( TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h index 84cd04b0710..25485689663 100644 --- a/TAO/tao/IIOP_Transport.h +++ b/TAO/tao/IIOP_Transport.h @@ -91,7 +91,7 @@ protected: virtual ssize_t recv (char *buf, size_t len, const ACE_Time_Value *s = 0); virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -109,12 +109,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); virtual int generate_request_header (TAO_Operation_Details &opdetails, diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 46222b87a7d..534b92a238a 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1,4 +1,4 @@ -// "$Id$" + // "$Id$" #include "tao/ORB.h" @@ -231,12 +231,12 @@ CORBA::ORB::work_pending (ACE_Time_Value &tv) int const result = this->orb_core_->reactor ()->work_pending (tv); if (result == 0 || (result == -1 && errno == ETIME)) - return 0; + return false; if (result == -1) throw ::CORBA::INTERNAL (); - return 1; + return true; } CORBA::Boolean @@ -247,12 +247,12 @@ CORBA::ORB::work_pending (void) const int result = this->orb_core_->reactor ()->work_pending (); if (result == 0) - return 0; + return false; if (result == -1) throw ::CORBA::INTERNAL (); - return 1; + return true; } #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 5a5cbe0d53f..5201a3b506c 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -396,7 +396,7 @@ namespace CORBA * * If this function is called with @a tv value, client threads * making invocations will continue their operations. When the - * operation timesout and returns, any invocations showing up on + * operation times out and returns, any invocations showing up on * the server will be buffered by TCP. **/ void run (ACE_Time_Value *tv); diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ea9a870bd25..d6e9033b9c6 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2104,15 +2104,11 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, int perform_work) // Every time we perform an interation we have to become the // leader again, because it is possible that a client has // acquired the leader role... - TAO_Leader_Follower &leader_follower = - this->leader_follower (); + TAO_Leader_Follower &leader_follower = this->leader_follower (); + TAO_LF_Strategy &lf_strategy = this->lf_strategy (); - TAO_LF_Strategy &lf_strategy = - this->lf_strategy (); + TAO_LF_Event_Loop_Thread_Helper helper (leader_follower, lf_strategy, tv); - TAO_LF_Event_Loop_Thread_Helper helper (leader_follower, - lf_strategy, - tv); result = helper.event_loop_return (); if (result != 0) { diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index 1515ddf04c8..fed8fb32a61 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -73,12 +73,11 @@ public: /// reactor. Else we don't resume the handle. void resume_handle (void); - // Hook method called at the end of a connection handler's - // handle_input function. Might override the handle_input - // return value or change the resume_handler's flag_ value. + /// Hook method called at the end of a connection handler's + /// handle_input function. Might override the handle_input + /// return value or change the resume_handler's flag_ value. void handle_input_return_value_hook (int& return_value); - private: /// Our ORB Core. diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp index b7901e74e9c..98558936eb5 100644 --- a/TAO/tao/Strategies/COIOP_Transport.cpp +++ b/TAO/tao/Strategies/COIOP_Transport.cpp @@ -91,7 +91,7 @@ int TAO_COIOP_Transport::send_request (TAO_Stub *, TAO_ORB_Core *, TAO_OutputCDR &, - int, + TAO_Message_Semantics, ACE_Time_Value *) { return 0; @@ -99,18 +99,18 @@ TAO_COIOP_Transport::send_request (TAO_Stub *, int TAO_COIOP_Transport::send_message (TAO_OutputCDR &, - TAO_Stub *, - int, - ACE_Time_Value *) + TAO_Stub *, + TAO_Message_Semantics, + ACE_Time_Value *) { return 1; } int TAO_COIOP_Transport::send_message_shared (TAO_Stub *, - int, - const ACE_Message_Block *, - ACE_Time_Value *) + TAO_Message_Semantics, + const ACE_Message_Block *, + ACE_Time_Value *) { return 1; } diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h index 7d7ab6a1dbd..1046ad06d51 100644 --- a/TAO/tao/Strategies/COIOP_Transport.h +++ b/TAO/tao/Strategies/COIOP_Transport.h @@ -81,7 +81,7 @@ protected: const ACE_Time_Value *s = 0); virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -94,12 +94,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); private: diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index 30512c277a0..535ce2a53a6 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -226,7 +226,7 @@ int TAO_DIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, message_semantics) == -1) @@ -247,7 +247,7 @@ TAO_DIOP_Transport::send_request (TAO_Stub *stub, int TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream, TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { // Format the message in the stream first @@ -281,7 +281,7 @@ TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream, int TAO_DIOP_Transport::send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h index ff3bafc1883..ba3363dfdcf 100644 --- a/TAO/tao/Strategies/DIOP_Transport.h +++ b/TAO/tao/Strategies/DIOP_Transport.h @@ -85,7 +85,7 @@ protected: const ACE_Time_Value *s = 0); virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -98,12 +98,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); private: diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index 575cb609323..903ccf22922 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -109,10 +109,10 @@ TAO_SCIOP_Transport::recv (char *buf, int TAO_SCIOP_Transport::send_request (TAO_Stub *stub, - TAO_ORB_Core *orb_core, - TAO_OutputCDR &stream, - int message_semantics, - ACE_Time_Value *max_wait_time) + TAO_ORB_Core *orb_core, + TAO_OutputCDR &stream, + TAO_Message_Semantics message_semantics, + ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, message_semantics) == -1) @@ -132,9 +132,9 @@ TAO_SCIOP_Transport::send_request (TAO_Stub *stub, int TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream, - TAO_Stub *stub, - int message_semantics, - ACE_Time_Value *max_wait_time) + TAO_Stub *stub, + TAO_Message_Semantics message_semantics, + ACE_Time_Value *max_wait_time) { // Format the message in the stream first if (this->messaging_object_->format_message (stream) != 0) @@ -161,9 +161,9 @@ TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream, int TAO_SCIOP_Transport::send_message_shared (TAO_Stub *stub, - int message_semantics, - const ACE_Message_Block *message_block, - ACE_Time_Value *max_wait_time) + TAO_Message_Semantics message_semantics, + const ACE_Message_Block *message_block, + ACE_Time_Value *max_wait_time) { int r; @@ -184,8 +184,8 @@ TAO_SCIOP_Transport::send_message_shared (TAO_Stub *stub, int TAO_SCIOP_Transport::generate_request_header (TAO_Operation_Details &opdetails, - TAO_Target_Specification &spec, - TAO_OutputCDR &msg) + TAO_Target_Specification &spec, + TAO_OutputCDR &msg) { // Check whether we have a Bi Dir SCIOP policy set, whether the // messaging objects are ready to handle bidirectional connections diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h index bf57a245b43..6838be27c87 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.h +++ b/TAO/tao/Strategies/SCIOP_Transport.h @@ -79,7 +79,7 @@ protected: const ACE_Time_Value *s = 0); virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -90,12 +90,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &association, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &association, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); /*virtual int send_reply (TAO_OutputCDR &stream, diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp index 68bb3500d54..bd8d5f60170 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.cpp +++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp @@ -273,7 +273,7 @@ int TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, @@ -293,9 +293,9 @@ TAO_SHMIOP_Transport::send_request (TAO_Stub *stub, int TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream, - TAO_Stub *stub, - int message_semantics, - ACE_Time_Value *max_wait_time) + TAO_Stub *stub, + TAO_Message_Semantics message_semantics, + ACE_Time_Value *max_wait_time) { // Format the message in the stream first if (this->messaging_object_->format_message (stream) != 0) diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h index a4142951b79..79a05c1f005 100644 --- a/TAO/tao/Strategies/SHMIOP_Transport.h +++ b/TAO/tao/Strategies/SHMIOP_Transport.h @@ -91,12 +91,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); private: diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp index 76033e70086..3327173b771 100644 --- a/TAO/tao/Strategies/UIOP_Transport.cpp +++ b/TAO/tao/Strategies/UIOP_Transport.cpp @@ -102,7 +102,7 @@ int TAO_UIOP_Transport::send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { if (this->ws_->sending_request (orb_core, message_semantics) == -1) @@ -119,7 +119,7 @@ TAO_UIOP_Transport::send_request (TAO_Stub *stub, int TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream, TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time) { // Format the message in the stream first diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h index bd37c90d808..3c596e74c73 100644 --- a/TAO/tao/Strategies/UIOP_Transport.h +++ b/TAO/tao/Strategies/UIOP_Transport.h @@ -85,12 +85,12 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_wait_time); virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0); //@} diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 5896e8ff9c7..5b8360e7cbf 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -290,7 +290,7 @@ TAO_Transport::tear_listen_point_list (TAO_InputCDR &) int TAO_Transport::send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { @@ -1237,7 +1237,7 @@ TAO_Transport::send_connection_closed_notifications_i (void) int TAO_Transport::send_message_shared_i (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time) { diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 90ada1bca88..b4dc1a1b5cc 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -596,7 +596,7 @@ public: virtual int handle_input (TAO_Resume_Handle &rh, ACE_Time_Value *max_wait_time = 0); - enum + enum TAO_Message_Semantics { TAO_ONEWAY_REQUEST = 0, TAO_TWOWAY_REQUEST = 1, @@ -632,7 +632,7 @@ public: virtual int send_request (TAO_Stub *stub, TAO_ORB_Core *orb_core, TAO_OutputCDR &stream, - int message_semantics, + TAO_Message_Semantics message_semantics, ACE_Time_Value *max_time_wait) = 0; /// This method formats the stream and then sends the message on the @@ -646,7 +646,7 @@ public: */ virtual int send_message (TAO_OutputCDR &stream, TAO_Stub *stub = 0, - int message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, + TAO_Message_Semantics message_semantics = TAO_Transport::TAO_TWOWAY_REQUEST, ACE_Time_Value *max_time_wait = 0) = 0; /// Sent the contents of @a message_block @@ -665,7 +665,7 @@ public: * block, used in the implementation of timeouts. */ virtual int send_message_shared (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); @@ -679,7 +679,7 @@ protected: /// Implement send_message_shared() assuming the handler_lock_ is /// held. int send_message_shared_i (TAO_Stub *stub, - int message_semantics, + TAO_Message_Semantics message_semantics, const ACE_Message_Block *message_block, ACE_Time_Value *max_wait_time); |