diff options
39 files changed, 171 insertions, 263 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1fa8f04b1b1..a06973a6b07 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,9 +1,51 @@ +Thu Feb 8 16:26:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/AnyTypeCode/ExceptionA.h + * tao/AnyTypeCode/TypeCode.cpp + * tao/Asynch_Reply_Dispatcher_Base.cpp + * tao/DynamicInterface/Context.h + * tao/DynamicInterface/DII_Arguments.cpp + * tao/DynamicInterface/DII_Invocation.cpp + * tao/DynamicInterface/DII_Invocation_Adapter.cpp + * tao/DynamicInterface/DII_Invocation_Adapter.h + * tao/DynamicInterface/DII_Reply_Dispatcher.cpp + * tao/DynamicInterface/Dynamic_Adapter_Impl.cpp + * tao/DynamicInterface/Dynamic_Adapter_Impl.h + * tao/DynamicInterface/Dynamic_Implementation.cpp + * tao/DynamicInterface/Dynamic_Implementation.h + * tao/DynamicInterface/ExceptionList.h + * tao/DynamicInterface/Server_Request.cpp + * tao/DynamicInterface/Server_Request.h + * tao/DynamicInterface/Unknown_User_Exception.cpp + * tao/DynamicInterface/Unknown_User_Exception.h + * tao/Exception.h + * tao/GIOP_Message_Base.cpp + * tao/GIOP_Message_Lite.cpp + * tao/ImR_Client/ImR_Client.cpp + * tao/ImR_Client/ServerObject_i.h + * tao/Invocation_Adapter.cpp + * tao/Messaging/Asynch_Invocation.cpp + * tao/Messaging/Asynch_Invocation_Adapter.cpp + * tao/Messaging/Asynch_Invocation_Adapter.h + * tao/Messaging/Asynch_Reply_Dispatcher.cpp + * tao/Messaging/Messaging_Policy_i.cpp + * tao/Muxed_TMS.cpp + * tao/ObjRefTemplate/ORT_Adapter_Impl.cpp + * tao/ORB.cpp + * tao/PolicyC.cpp + * tao/RTCORBA/RTCORBAC.cpp + * tao/SystemException.cpp + * tao/Tagged_Components.cpp + * tao/Tagged_Profile.cpp + * tao/WrongTransactionC.cpp + Layout changes + Wed Feb 7 23:12:03 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h: * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp: - Changed to use Any_Impl instead of Any to fix memory crash + Changed to use Any_Impl instead of Any to fix memory crash problem since Any_Imply is refcounted. Refer to Bug 2798 or RT 9552 for more info. diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 2b735a03bd7..61156287d71 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -25,9 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is used in the implementation of the _raise methods -#define TAO_RAISE(EXCEPTION) throw EXCEPTION - #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h" #include "tao/Exception.h" diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index 5dfc14472c4..3964289f260 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -270,12 +270,11 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const void CORBA::TypeCode::Bounds::_raise (void) const { - TAO_RAISE(*this); + throw *this; } void -CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr - ) const +CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr) const { if (cdr << this->_rep_id ()) { @@ -286,8 +285,7 @@ CORBA::TypeCode::Bounds::_tao_encode (TAO_OutputCDR &cdr } void -CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR & - ) +CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &) { } @@ -318,12 +316,11 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const void CORBA::TypeCode::BadKind::_raise (void) const { - TAO_RAISE(*this); + throw *this; } void -CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr - ) const +CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr) const { if (cdr << this->_rep_id ()) { @@ -334,8 +331,7 @@ CORBA::TypeCode::BadKind::_tao_encode (TAO_OutputCDR &cdr } void -CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR & - ) +CORBA::TypeCode::BadKind::_tao_decode (TAO_InputCDR &) { } diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp index ed6a6fcb2a1..ae6ea86cfca 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp @@ -70,8 +70,7 @@ TAO_Asynch_Reply_Dispatcher_Base::transport (TAO_Transport *t) // Must override pure virtual method in TAO_Reply_Dispatcher. int TAO_Asynch_Reply_Dispatcher_Base::dispatch_reply ( - TAO_Pluggable_Reply_Params & /*params*/ - ) + TAO_Pluggable_Reply_Params & /*params*/) { return 0; } diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index 8be691e8c81..69e89b78071 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -95,24 +95,19 @@ namespace CORBA CORBA::Context_ptr parent (void) const; void create_child (const char *child_ctx_name, - CORBA::Context_out child_ctx - ); + CORBA::Context_out child_ctx); void set_one_value (const char *propname, - const CORBA::Any &propvalue - ); + const CORBA::Any &propvalue); - void set_values (CORBA::NVList_ptr values - ); + void set_values (CORBA::NVList_ptr values); - void delete_values (const char *propname - ); + void delete_values (const char *propname); void get_values (const char *start_scope, CORBA::Flags op_flags, const char *pattern, - CORBA::NVList_ptr &values - ); + CORBA::NVList_ptr &values); // Useful for template programming. typedef CORBA::Context_ptr _ptr_type; @@ -139,8 +134,7 @@ namespace CORBA /// Constructor - initialize given a length and an array of /// strings. - ContextList (CORBA::ULong len, - char **ctx_list); + ContextList (CORBA::ULong len, char **ctx_list); /// Destructor. ~ContextList (void); @@ -167,12 +161,10 @@ namespace CORBA void add_consume (char *ctx); /// Return the typecode at slot i. Raises the "Bounds" exception. - char *item (CORBA::ULong slot - ); + char *item (CORBA::ULong slot); /// Remove the typecode at slot i. Raises the "Bounds" exception. - void remove (CORBA::ULong slot - ); + void remove (CORBA::ULong slot); /// Increment and decrement ref counts. void _incr_refcnt (void); diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp index 881bb69bfb6..392390a809c 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp @@ -79,8 +79,7 @@ namespace TAO this->x_->_tao_incoming_cdr ( cdr, CORBA::ARG_OUT | CORBA::ARG_INOUT, - this->lazy_evaluation_ - ); + this->lazy_evaluation_); } catch (const ::CORBA::Exception&) { diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp index aa10fadc2a4..c62aebedab5 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp @@ -57,8 +57,7 @@ namespace TAO Dynamic::ParameterList_var safe_parameter_list = parameter_list; - TAO::Argument **args = - this->details_.args (); + TAO::Argument **args = this->details_.args (); if (this->details_.args_num () > 1) { @@ -184,8 +183,7 @@ namespace TAO Dynamic::ParameterList_var safe_parameter_list = parameter_list; - TAO::Argument **args = - this->details_.args (); + TAO::Argument **args = this->details_.args (); if (this->details_.args_num () > 1) { diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp index 46b6a662470..e24bc1fc340 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp @@ -45,6 +45,10 @@ namespace TAO { } + DII_Invocation_Adapter::~DII_Invocation_Adapter (void) + { + } + Invocation_Status DII_Invocation_Adapter::invoke_twoway ( TAO_Operation_Details &op, diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h index 88a1df41668..600cf15f5a9 100644 --- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h +++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h @@ -87,8 +87,7 @@ namespace TAO CORBA::Request *r, Invocation_Mode mode = TAO_DII_INVOCATION); - - virtual ~DII_Invocation_Adapter (void) {} + virtual ~DII_Invocation_Adapter (void); protected: @@ -96,8 +95,7 @@ namespace TAO TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ); + ACE_Time_Value *&max_wait_time); private: @@ -132,9 +130,7 @@ namespace TAO TAO::Invocation_Mode mode = TAO_DII_DEFERRED_INVOCATION); /// Invoke the target - virtual void invoke (TAO::Exception_Data *ex, - unsigned long ex_count - ); + virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); protected: @@ -142,8 +138,7 @@ namespace TAO TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ); + ACE_Time_Value *&max_wait_time); private: CORBA::Request *request_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 6c209a2c955..2155ff18637 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -32,8 +32,7 @@ TAO_DII_Deferred_Reply_Dispatcher::~TAO_DII_Deferred_Reply_Dispatcher (void) // Dispatch the reply. int TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( - TAO_Pluggable_Reply_Params ¶ms - ) + TAO_Pluggable_Reply_Params ¶ms) { if (params.input_cdr_ == 0) return -1; @@ -103,20 +102,16 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void) try { // Generate a fake exception.... - CORBA::COMM_FAILURE comm_failure (0, - CORBA::COMPLETED_MAYBE); + CORBA::COMM_FAILURE comm_failure (0, CORBA::COMPLETED_MAYBE); TAO_OutputCDR out_cdr; - comm_failure._tao_encode (out_cdr - ); + comm_failure._tao_encode (out_cdr); // Turn into an output CDR TAO_InputCDR cdr (out_cdr); - this->req_->handle_response (cdr, - TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION - ); + this->req_->handle_response (cdr, TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION); } catch (const ::CORBA::Exception& ex) { diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp index fba11751451..17e490a305e 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp @@ -28,9 +28,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( CORBA::NamedValue_ptr result, CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, - CORBA::Flags req_flags - - ) + CORBA::Flags req_flags) { ACE_NEW_THROW_EX (request, CORBA::Request (obj, @@ -53,8 +51,7 @@ TAO_Dynamic_Adapter_Impl::create_request ( CORBA::Request_ptr TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, - const char *operation - ) + const char *operation) { CORBA::Request_ptr req = CORBA::Request::_nil (); ACE_NEW_THROW_EX (req, @@ -120,9 +117,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req) void TAO_Dynamic_Adapter_Impl::create_exception_list ( - CORBA::ExceptionList_ptr &list - - ) + CORBA::ExceptionList_ptr &list) { ACE_NEW_THROW_EX (list, CORBA::ExceptionList, diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h index 96e66e9dafc..9c8b60dcabc 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h +++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h @@ -57,13 +57,11 @@ public: CORBA::NamedValue_ptr result, CORBA::ExceptionList_ptr exceptions, CORBA::Request_ptr &request, - CORBA::Flags req_flags - ); + CORBA::Flags req_flags); virtual CORBA::Request_ptr request (CORBA::Object_ptr obj, CORBA::ORB_ptr orb, - const char *op - ); + const char *op); // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest. @@ -81,8 +79,7 @@ public: // CORBA::ORB::create_exception_list. - virtual void create_exception_list (CORBA::ExceptionList_ptr &list - ); + virtual void create_exception_list (CORBA::ExceptionList_ptr &list); // Used to force the initialization of the ORB code. static int Initializer (void); diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp index ade43f774a1..e37d9cac8d3 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp @@ -19,11 +19,9 @@ ACE_RCSID (DynamicInterface, TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Boolean -TAO_DynamicImplementation::_is_a (const char *logical_type_id - ) +TAO_DynamicImplementation::_is_a (const char *logical_type_id) { - CORBA::RepositoryId_var id = - this->get_id_from_primary_interface (); + CORBA::RepositoryId_var id = this->get_id_from_primary_interface (); return ACE_OS::strcmp (logical_type_id, id.in ()) == 0; } @@ -113,21 +111,17 @@ TAO_DynamicImplementation::_create_stub (void) ); CORBA::RepositoryId_var pinterface = - this->_primary_interface (poa_current_impl->object_id (), - poa.in () - ); + this->_primary_interface (poa_current_impl->object_id (), poa.in ()); return poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (), pinterface.in (), - poa_current_impl->priority () - ); + poa_current_impl->priority ()); } void TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, - void * /* context */ - ) + void * /* context */) { // No need to do any of this if the client isn't waiting. if (request.response_expected ()) @@ -158,8 +152,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, try { // Delegate to user. - this->invoke (dsi_request - ); + this->invoke (dsi_request); // Only if the client is waiting. if (request.response_expected () && !request.sync_with_server ()) @@ -180,9 +173,7 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request, } CORBA::RepositoryId -TAO_DynamicImplementation::get_id_from_primary_interface ( - - ) +TAO_DynamicImplementation::get_id_from_primary_interface (void) { // If this method is called outside of the // context of a request invocation on a target object being served @@ -198,12 +189,9 @@ TAO_DynamicImplementation::get_id_from_primary_interface ( throw PortableServer::POA::WrongPolicy (); } - PortableServer::POA_var poa = - poa_current_impl->get_POA (); + PortableServer::POA_var poa = poa_current_impl->get_POA (); - return this->_primary_interface (poa_current_impl->object_id (), - poa.in () - ); + return this->_primary_interface (poa_current_impl->object_id (), poa.in ()); } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h index 53b700b7c6e..3ebc76de254 100644 --- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h +++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h @@ -59,29 +59,23 @@ public: /// The invoke() method receives requests issued to any CORBA object /// incarnated by the DSI servant and performs the processing /// necessary to execute the request. - virtual void invoke (CORBA::ServerRequest_ptr request - ) = 0; + virtual void invoke (CORBA::ServerRequest_ptr request) = 0; /// The _primary_interface() method receives an ObjectId value and a /// POA_ptr as input parameters and returns a valid RepositoryId /// representing the most-derived interface for that oid. virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - - ) = 0; + PortableServer::POA_ptr poa) = 0; /// Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _is_a (const char *logical_type_id - ); + virtual CORBA::Boolean _is_a (const char *logical_type_id); /// Returns a CORBA::Object_ptr for the target object. CORBA::Object_ptr _this (void); /// Query the Interface Repository for the interface definition. - virtual CORBA::InterfaceDef_ptr _get_interface ( - void - ); + virtual CORBA::InterfaceDef_ptr _get_interface (void); protected: @@ -95,15 +89,11 @@ protected: virtual TAO_Stub *_create_stub (void); /// Turns around and calls invoke. - virtual void _dispatch (TAO_ServerRequest &request, - void *context - ); + virtual void _dispatch (TAO_ServerRequest &request, void *context); private: /// Encapsulates code common to _is_a(), _get_interface() and _create_stub(). - CORBA::RepositoryId get_id_from_primary_interface ( - void - ); + CORBA::RepositoryId get_id_from_primary_interface (void); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h index 1fd0259e5d0..f16bf850b49 100644 --- a/TAO/tao/DynamicInterface/ExceptionList.h +++ b/TAO/tao/DynamicInterface/ExceptionList.h @@ -71,8 +71,7 @@ namespace CORBA /// Constructor - initialize given a length and an array of /// TypeCodes. - ExceptionList (CORBA::ULong len, - CORBA::TypeCode_ptr *tc_list); + ExceptionList (CORBA::ULong len, CORBA::TypeCode_ptr *tc_list); /// Destructor. ~ExceptionList (void); diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 2c0cc17b921..47d3ae45b80 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -63,7 +63,7 @@ CORBA::ServerRequest::ServerRequest (TAO_ServerRequest &orb_server_request) exception_ (0), refcount_ (1), orb_server_request_ (orb_server_request), - sent_gateway_exception_ (0) + sent_gateway_exception_ (false) { this->orb_server_request_.is_dsi (); } @@ -82,8 +82,7 @@ CORBA::ServerRequest::~ServerRequest (void) // Unmarshal in/inout params, and set up to marshal the appropriate // inout/out/return values later on. void -CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list - ) +CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list) { // arguments() must be called before either of these. if (this->params_ != 0 || this->exception_ != 0) @@ -96,13 +95,11 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list this->params_->_tao_incoming_cdr (*this->orb_server_request_.incoming (), CORBA::ARG_IN | CORBA::ARG_INOUT, - this->lazy_evaluation_ - ); + this->lazy_evaluation_); // Pass this alignment back to the TAO_ServerRequest. this->orb_server_request_.dsi_nvlist_align ( - this->params_->_tao_target_alignment () - ); + this->params_->_tao_target_alignment ()); } // Store the result value. There's either an exception, or a result, @@ -133,8 +130,7 @@ CORBA::ServerRequest::set_result (const CORBA::Any &value // Store the exception value. void -CORBA::ServerRequest::set_exception (const CORBA::Any &value - ) +CORBA::ServerRequest::set_exception (const CORBA::Any &value) { CORBA::TypeCode_var tc = value.type (); @@ -179,8 +175,7 @@ CORBA::ServerRequest::dsi_marshal (void) if (this->retval_ != 0) { this->retval_->impl ()->marshal_value ( - *this->orb_server_request_.outgoing () - ); + *this->orb_server_request_.outgoing ()); } // Send the "inout" and "out" parameters. @@ -188,9 +183,7 @@ CORBA::ServerRequest::dsi_marshal (void) { this->params_->_tao_encode ( *this->orb_server_request_.outgoing (), - CORBA::ARG_INOUT | CORBA::ARG_OUT - - ); + CORBA::ARG_INOUT | CORBA::ARG_OUT); } } else @@ -229,7 +222,7 @@ CORBA::ServerRequest::gateway_exception_reply (ACE_CString &raw_exception) ); // This will prevent the marshaling of any parameters into this reply. - this->sent_gateway_exception_ = 1; + this->sent_gateway_exception_ = true; this->orb_server_request_.tao_send_reply (); } diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h index b7d94dd59e1..2869d4fa3b1 100644 --- a/TAO/tao/DynamicInterface/Server_Request.h +++ b/TAO/tao/DynamicInterface/Server_Request.h @@ -77,24 +77,21 @@ namespace CORBA /// Implementation uses this to provide the ORB with the operation's /// parameter list ... on return, their values are available; the /// list fed in has typecodes and (perhap) memory assigned. - void arguments (CORBA::NVList_ptr &list - ); + void arguments (CORBA::NVList_ptr &list); /// Implementation uses this to provide the operation result /// ... illegal if exception() was called or params() was not called. /// /// XXX Implementation should be able to assume response has been /// sent when this returns, and reclaim memory it allocated. - void set_result (const CORBA::Any &value - ); + void set_result (const CORBA::Any &value); /// Implementation uses this to provide the exception value which is /// the only result of this particular invocation. /// /// XXX Implementation should be able to assume response has been /// sent when this returns, and reclaim memory it allocated. - void set_exception (const CORBA::Any &value - ); + void set_exception (const CORBA::Any &value); // = Get various universal call attributes. @@ -172,7 +169,7 @@ namespace CORBA TAO_ServerRequest &orb_server_request_; /// Have we sent a user exception obtained from a gateway? - int sent_gateway_exception_; + bool sent_gateway_exception_; }; } // End CORBA namespace diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 88e3d466953..72d8ba4c136 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -71,7 +71,7 @@ CORBA::UnknownUserException::_downcast (CORBA::Exception const * ex) void CORBA::UnknownUserException::_raise (void) const { - TAO_RAISE (*this); + throw *this; } CORBA::Exception * @@ -87,17 +87,13 @@ CORBA::UnknownUserException::_tao_duplicate (void) const } void -CORBA::UnknownUserException::_tao_encode ( - TAO_OutputCDR & - - ) const +CORBA::UnknownUserException::_tao_encode (TAO_OutputCDR &) const { throw ::CORBA::MARSHAL (); } void -CORBA::UnknownUserException::_tao_decode (TAO_InputCDR & - ) +CORBA::UnknownUserException::_tao_decode (TAO_InputCDR &) { throw ::CORBA::MARSHAL (); } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h index c97f08f5dcf..6f29240e5b4 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h @@ -79,10 +79,8 @@ namespace CORBA virtual void _raise (void) const; virtual CORBA::Exception *_tao_duplicate (void) const; - virtual void _tao_encode (TAO_OutputCDR &cdr - ) const; - virtual void _tao_decode (TAO_InputCDR &cdr - ); + virtual void _tao_encode (TAO_OutputCDR &cdr) const; + virtual void _tao_decode (TAO_InputCDR &cdr); /// Narrow to an UnknowUserException. static UnknownUserException * _downcast (CORBA::Exception *ex); diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index e4ee529106f..1153255ea71 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -25,9 +25,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -// This is used in the implementation of the _raise methods -#define TAO_RAISE(EXCEPTION) throw EXCEPTION - #include /**/ "tao/TAO_Export.h" #include "tao/Basic_Types.h" #include "tao/CORBA_String.h" diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index e393b10e927..23d1f6a365d 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -785,13 +785,11 @@ TAO_GIOP_Message_Base::process_reply_message ( { case TAO_PLUGGABLE_MESSAGE_REPLY: // Should be taken care by the state specific parsing - retval = - generator_parser->parse_reply (input_cdr, params); + retval = generator_parser->parse_reply (input_cdr, params); break; case TAO_PLUGGABLE_MESSAGE_LOCATEREPLY: - retval = - generator_parser->parse_locate_reply (input_cdr, params); + retval = generator_parser->parse_locate_reply (input_cdr, params); break; default: retval = -1; @@ -802,8 +800,7 @@ TAO_GIOP_Message_Base::process_reply_message ( params.input_cdr_ = &input_cdr; - retval = - params.transport_->tms ()->dispatch_reply (params); + retval = params.transport_->tms ()->dispatch_reply (params); if (retval == -1) { diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 1bb0a40276c..c0069d41d13 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -1147,7 +1147,7 @@ TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr, params.input_cdr_= &cdr; - if ( params.transport_->tms ()->dispatch_reply (params) == -1) + if (params.transport_->tms ()->dispatch_reply (params) == -1) { // Something really critical happened, we will forget about // every reply on this connection. diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp index 0ac87661ffd..038a8c76223 100644 --- a/TAO/tao/ImR_Client/ImR_Client.cpp +++ b/TAO/tao/ImR_Client/ImR_Client.cpp @@ -27,8 +27,7 @@ namespace TAO } void - ImR_Client_Adapter_Impl::imr_notify_startup ( - TAO_Root_POA* poa ) + ImR_Client_Adapter_Impl::imr_notify_startup (TAO_Root_POA* poa ) { CORBA::Object_var imr = poa->orb_core ().implrepo_service (); @@ -85,15 +84,12 @@ namespace TAO PortableServer::ObjectId_var id = root_poa->activate_object_i (this->server_object_, poa->server_priority (), - wait_occurred_restart_call_ignored - ); + wait_occurred_restart_call_ignored); - CORBA::Object_var obj = root_poa->id_to_reference_i (id.in (), false - ); + CORBA::Object_var obj = root_poa->id_to_reference_i (id.in (), false); ImplementationRepository::ServerObject_var svr - = ImplementationRepository::ServerObject::_narrow (obj.in () - ); + = ImplementationRepository::ServerObject::_narrow (obj.in ()); if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ()) { @@ -128,8 +124,7 @@ namespace TAO imr_locator->server_is_running (poa->name().c_str (), partial_ior.c_str(), - svr.in() - ); + svr.in()); } catch (const ::CORBA::SystemException&) { @@ -147,8 +142,7 @@ namespace TAO } void - ImR_Client_Adapter_Impl::imr_notify_shutdown ( - TAO_Root_POA* poa ) + ImR_Client_Adapter_Impl::imr_notify_shutdown (TAO_Root_POA* poa ) { // Notify the Implementation Repository about shutting down. CORBA::Object_var imr = poa->orb_core ().implrepo_service (); @@ -173,8 +167,7 @@ namespace TAO ImplementationRepository::Administration_var imr_locator = ImplementationRepository::Administration::_narrow (imr.in ()); - imr_locator->server_is_shutting_down (poa->name().c_str () - ); + imr_locator->server_is_shutting_down (poa->name().c_str ()); } catch (const ::CORBA::COMM_FAILURE&) { @@ -199,8 +192,7 @@ namespace TAO if (this->server_object_) { - PortableServer::POA_var poa = - this->server_object_->_default_POA (); + PortableServer::POA_var poa = this->server_object_->_default_POA (); TAO_Root_POA *root_poa = dynamic_cast <TAO_Root_POA*> (poa.in ()); @@ -210,8 +202,7 @@ namespace TAO } PortableServer::ObjectId_var id = - root_poa->servant_to_id_i (this->server_object_ - ); + root_poa->servant_to_id_i (this->server_object_); root_poa->deactivate_object_i (id.in()); diff --git a/TAO/tao/ImR_Client/ServerObject_i.h b/TAO/tao/ImR_Client/ServerObject_i.h index f7b28b8af41..cb997f85b22 100644 --- a/TAO/tao/ImR_Client/ServerObject_i.h +++ b/TAO/tao/ImR_Client/ServerObject_i.h @@ -41,8 +41,7 @@ class TAO_IMR_Client_Export ServerObject_i { public: /// Constructor. - ServerObject_i (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa); + ServerObject_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); /// Ping method. void ping (void) diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index 80b2cc47312..4bb1a3fb5e5 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -52,8 +52,7 @@ namespace TAO } void - Invocation_Adapter::invoke_i (TAO_Stub *stub, - TAO_Operation_Details &details) + Invocation_Adapter::invoke_i (TAO_Stub *stub, TAO_Operation_Details &details) { // The invocation has got to be within the context of the // corresponding ORB's configuration. Otherwise things like @@ -81,12 +80,10 @@ namespace TAO // the object reference also refers to a collocated object. if (cpb_ != 0 || effective_target->_servant () != 0) { - strat = - TAO_ORB_Core::collocation_strategy (effective_target.in ()); + strat = TAO_ORB_Core::collocation_strategy (effective_target.in ()); } - if (strat == TAO_CS_REMOTE_STRATEGY || - strat == TAO_CS_LAST) + if (strat == TAO_CS_REMOTE_STRATEGY || strat == TAO_CS_LAST) { ACE_Time_Value *max_wait_time = 0; status = @@ -311,14 +308,12 @@ namespace TAO TAO::Synch_Twoway_Invocation synch (this->target_, r, details); - Invocation_Status const status = - synch.remote_twoway (max_wait_time); + Invocation_Status const status = synch.remote_twoway (max_wait_time); if (status == TAO_INVOKE_RESTART && synch.is_forwarded ()) { - effective_target = - synch.steal_forwarded_reference (); + effective_target = synch.steal_forwarded_reference (); #if TAO_HAS_INTERCEPTORS == 1 const bool is_permanent_forward = @@ -343,14 +338,12 @@ namespace TAO { TAO::Synch_Oneway_Invocation synch (this->target_, r, details); - Invocation_Status const s = - synch.remote_oneway (max_wait_time); + Invocation_Status const s = synch.remote_oneway (max_wait_time); if (s == TAO_INVOKE_RESTART && synch.is_forwarded ()) { - effective_target = - synch.steal_forwarded_reference (); + effective_target = synch.steal_forwarded_reference (); #if TAO_HAS_INTERCEPTORS == 1 const bool is_permanent_forward = @@ -373,8 +366,7 @@ namespace TAO { // The object pointer has to be changed to a TAO_Stub pointer // in order to obtain the profiles. - TAO_Stub *stubobj = - effective_target->_stubobj (); + TAO_Stub *stubobj = effective_target->_stubobj (); if (stubobj == 0) throw ::CORBA::INTERNAL ( diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp index da8702ff120..c35d2cde9af 100644 --- a/TAO/tao/Messaging/Asynch_Invocation.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation.cpp @@ -118,8 +118,7 @@ namespace TAO // Nothing great on here. If we get a restart during send or a // proper send, we are supposed to call receiver_other () // interception point. So we do that here - Invocation_Status const tmp = - this->receive_other_interception (); + Invocation_Status const tmp = this->receive_other_interception (); // We got an error during the interception. if (s == TAO_INVOKE_SUCCESS && tmp != TAO_INVOKE_SUCCESS) diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp index 38550793bb7..c4c15850c87 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp @@ -47,8 +47,7 @@ namespace TAO void Asynch_Invocation_Adapter::invoke ( Messaging::ReplyHandler_ptr reply_handler_ptr, - const TAO_Reply_Handler_Skeleton &reply_handler_skel - ) + const TAO_Reply_Handler_Skeleton &reply_handler_skel) { TAO_Stub * stub = this->get_stub (); @@ -131,8 +130,7 @@ namespace TAO return Invocation_Adapter::invoke_collocated_i (stub, details, effective_target, - strat - ); + strat); } Invocation_Status @@ -140,8 +138,7 @@ namespace TAO TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ) + ACE_Time_Value *&max_wait_time) { // Simple sanity check if (this->mode_ != TAO_ASYNCHRONOUS_CALLBACK_INVOCATION @@ -162,8 +159,7 @@ namespace TAO // AMI Timeout Handling Begin ACE_Time_Value tmp; - if (this->get_timeout (r.stub (), - tmp)) + if (this->get_timeout (r.stub (), tmp)) { this->safe_rd_->schedule_timer ( op.request_id (), @@ -179,9 +175,7 @@ namespace TAO op, this->safe_rd_.release ()); - Invocation_Status const s = - asynch.remote_invocation (max_wait_time - ); + Invocation_Status const s = asynch.remote_invocation (max_wait_time); if (s == TAO_INVOKE_RESTART && asynch.is_forwarded ()) @@ -195,10 +189,7 @@ namespace TAO CORBA::Boolean const permanent_forward = false; #endif - this->object_forwarded (effective_target, - r.stub (), - permanent_forward - ); + this->object_forwarded (effective_target, r.stub (), permanent_forward); } return s; diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index 85c7501e9dd..e8f175910ea 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -73,27 +73,22 @@ namespace TAO TAO::Invocation_Mode mode = TAO_ASYNCHRONOUS_CALLBACK_INVOCATION); void invoke (Messaging::ReplyHandler_ptr reply_handler_ptr, - const TAO_Reply_Handler_Skeleton &reply_handler_skel - ); + const TAO_Reply_Handler_Skeleton &reply_handler_skel); - virtual void invoke (TAO::Exception_Data *ex, - unsigned long ex_count - ); + virtual void invoke (TAO::Exception_Data *ex, unsigned long ex_count); protected: virtual Invocation_Status invoke_twoway ( TAO_Operation_Details &op, CORBA::Object_var &effective_target, Profile_Transport_Resolver &r, - ACE_Time_Value *&max_wait_time - ); + ACE_Time_Value *&max_wait_time); virtual Invocation_Status invoke_collocated_i ( TAO_Stub *stub, TAO_Operation_Details &details, CORBA::Object_var &effective_target, - Collocation_Strategy strat - ); + Collocation_Strategy strat); private: /// Autofunctor to manage the reply dispatcher diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 4836c3910f7..b4bc0cb4485 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -35,9 +35,7 @@ TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void) // Dispatch the reply. int -TAO_Asynch_Reply_Dispatcher::dispatch_reply ( - TAO_Pluggable_Reply_Params ¶ms - ) +TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) { if (params.input_cdr_ == 0) return -1; @@ -163,7 +161,6 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) comm_failure._tao_encode (out_cdr); - // Turn into an output CDR TAO_InputCDR cdr (out_cdr); diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 50e59b8c082..9ab757e6aaa 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -171,8 +171,7 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) TimeBase::TimeT t = this->relative_expiry_; TimeBase::TimeT seconds = t / 10000000u; TimeBase::TimeT microseconds = (t % 10000000u) / 10; - time_value.set (ACE_U64_TO_U32 (seconds), - ACE_U64_TO_U32 (microseconds)); + time_value.set (ACE_U64_TO_U32 (seconds), ACE_U64_TO_U32 (microseconds)); if (TAO_debug_level > 0) { diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index bebf349b9be..1420eb9ff80 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -156,7 +156,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) // cases we dispatch with the lock held. // Dispatch the reply. // They return 1 on success, and -1 on failure. - result = rd->dispatch_reply (params); + result = rd->dispatch_reply (params); } return result; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 69b64df907a..b800fa0383b 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -113,7 +113,7 @@ CORBA::ORB::InvalidName::_tao_duplicate (void) const void CORBA::ORB::InvalidName::_raise (void) const { - TAO_RAISE (*this); + throw *this; } void CORBA::ORB::InvalidName::_tao_encode (TAO_OutputCDR &) const diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp index f3cba5e3281..f38a6462b49 100644 --- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp +++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp @@ -42,9 +42,7 @@ TAO::ORT_Adapter_Impl::make_object (const char *repo_id, const PortableInterceptor::ObjectId &id) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->ort_factory_->make_object (repo_id, - id - ); + return this->ort_factory_->make_object (repo_id, id); } PortableInterceptor::ObjectReferenceTemplate * diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 84528418d76..a321ccdb12c 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -162,7 +162,7 @@ CORBA::PolicyError::_tao_duplicate (void) const void CORBA::PolicyError::_raise (void) const { - TAO_RAISE (*this); + throw *this; } void CORBA::PolicyError::_tao_encode ( @@ -298,13 +298,10 @@ CORBA::InvalidPolicies::_tao_duplicate (void) const void CORBA::InvalidPolicies::_raise (void) const { - TAO_RAISE (*this); + throw *this; } -void CORBA::InvalidPolicies::_tao_encode ( - TAO_OutputCDR &cdr - - ) const +void CORBA::InvalidPolicies::_tao_encode (TAO_OutputCDR &cdr) const { if (cdr << *this) { @@ -314,10 +311,7 @@ void CORBA::InvalidPolicies::_tao_encode ( throw ::CORBA::MARSHAL (); } -void CORBA::InvalidPolicies::_tao_decode ( - TAO_InputCDR &cdr - - ) +void CORBA::InvalidPolicies::_tao_decode (TAO_InputCDR &cdr) { if (cdr >> *this) { diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index c03ea57414b..60b3ab5ff95 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -2358,7 +2358,7 @@ RTCORBA::RTORB::MutexNotFound::_tao_duplicate (void) const void RTCORBA::RTORB::MutexNotFound::_raise (void) const { - TAO_RAISE (*this); + throw *this; } void RTCORBA::RTORB::MutexNotFound::_tao_encode ( @@ -2453,7 +2453,7 @@ RTCORBA::RTORB::InvalidThreadpool::_tao_duplicate (void) const void RTCORBA::RTORB::InvalidThreadpool::_raise (void) const { - TAO_RAISE (*this); + throw *this; } void RTCORBA::RTORB::InvalidThreadpool::_tao_encode ( diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index acf91be1416..c2a8e88b54b 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -947,7 +947,7 @@ TAO::create_system_exception (const char *id) void \ CORBA::name ::_raise (void) const \ { \ - TAO_RAISE (*this); \ + throw *this; \ } STANDARD_EXCEPTION_LIST diff --git a/TAO/tao/Tagged_Components.cpp b/TAO/tao/Tagged_Components.cpp index 72ce1808dea..7580d2a3b28 100644 --- a/TAO/tao/Tagged_Components.cpp +++ b/TAO/tao/Tagged_Components.cpp @@ -46,10 +46,8 @@ TAO_Tagged_Components::set_code_sets ( void TAO_Tagged_Components::set_code_sets (CONV_FRAME::CodeSetComponentInfo &ci) { - this->set_code_sets_i (this->code_sets_.ForCharData, - ci.ForCharData); - this->set_code_sets_i (this->code_sets_.ForWcharData, - ci.ForWcharData); + this->set_code_sets_i (this->code_sets_.ForCharData, ci.ForCharData); + this->set_code_sets_i (this->code_sets_.ForWcharData, ci.ForWcharData); this->code_sets_set_ = 1; TAO_OutputCDR cdr; @@ -170,10 +168,8 @@ TAO_Tagged_Components::set_known_component_i ( return; } - this->set_code_sets_i (this->code_sets_.ForCharData, - ci.ForCharData); - this->set_code_sets_i (this->code_sets_.ForWcharData, - ci.ForWcharData); + this->set_code_sets_i (this->code_sets_.ForCharData, ci.ForCharData); + this->set_code_sets_i (this->code_sets_.ForWcharData, ci.ForWcharData); this->code_sets_set_ = 1; } } diff --git a/TAO/tao/Tagged_Profile.cpp b/TAO/tao/Tagged_Profile.cpp index 3f1e5e1f37f..3da8417bbc9 100644 --- a/TAO/tao/Tagged_Profile.cpp +++ b/TAO/tao/Tagged_Profile.cpp @@ -27,18 +27,14 @@ TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile) this->orb_core_->lane_resources ().acceptor_registry (); // Get the right acceptor for the tag in the TaggedProfile - TAO_Acceptor *acceptor = - acceptor_registry.get_acceptor (profile.tag); + TAO_Acceptor *acceptor = acceptor_registry.get_acceptor (profile.tag); if (acceptor) { // Get the object key - int retval = - acceptor->object_key (profile, - this->object_key_); - if (retval == -1) + if (acceptor->object_key (profile, this->object_key_) == -1) { - return 0; + return false; } } else @@ -49,10 +45,10 @@ TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile) ACE_TEXT ("(%P|%t)TAO_Tagged_Profile \n"))); } - return 0; + return false; } - return 1; + return true; } CORBA::Boolean @@ -77,7 +73,7 @@ TAO_Tagged_Profile::unmarshall_target_address (TAO_InputCDR &cdr) break; default: - hdr_status = 0; + hdr_status = false; break; } } @@ -124,8 +120,7 @@ CORBA::Boolean TAO_Tagged_Profile::unmarshall_iop_profile_i ( TAO_InputCDR &input) { - CORBA::Boolean hdr_status = - (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); // Extract into the IOP::Tagged profile. hdr_status &= input >> this->profile_; @@ -137,8 +132,7 @@ CORBA::Boolean TAO_Tagged_Profile::unmarshall_ref_addr_i ( TAO_InputCDR &input) { - CORBA::Boolean hdr_status = - (CORBA::Boolean) input.good_bit (); + CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); /* * The GIOP::IORAddressingInfo is defined as follows @@ -159,8 +153,7 @@ TAO_Tagged_Profile::unmarshall_ref_addr_i ( // First read the profile index CORBA::ULong prof_index = 0; - hdr_status = - hdr_status && input.read_ulong (prof_index); + hdr_status = hdr_status && input.read_ulong (prof_index); // Set the value in TAO_Tagged_Profile if (hdr_status) diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index ad6e5150b31..a40a1facb22 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -122,7 +122,7 @@ CORBA::WrongTransaction::_tao_duplicate (void) const void CORBA::WrongTransaction::_raise (void) const { - TAO_RAISE (*this); + throw *this; } void CORBA::WrongTransaction::_tao_encode ( |