diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:13:11 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-13 18:13:11 +0000 |
commit | b740d2d231d5b2a6e83c55a2552ffe20e822b490 (patch) | |
tree | 5eb76d5e45fbea961b048a0c51636fef037b6c35 /TAO/tao | |
parent | 2cfe062bb65032a4e5af0d249508154f8ed63ccd (diff) | |
download | ATCD-b740d2d231d5b2a6e83c55a2552ffe20e822b490.tar.gz |
Zapped trailing whitespace
Diffstat (limited to 'TAO/tao')
65 files changed, 167 insertions, 167 deletions
diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index d3a980c286c..81c213017ee 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -498,7 +498,7 @@ namespace CORBA TAO_AnyTypeCode_Export CORBA::Boolean operator<< (TAO_OutputCDR & cdr, const CORBA::TypeCode_ptr tc); -TAO_AnyTypeCode_Export CORBA::Boolean +TAO_AnyTypeCode_Export CORBA::Boolean operator>> (TAO_InputCDR & cdr, CORBA::TypeCode_ptr & tc); #if defined (GEN_OSTREAM_OPS) diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index c2877a339d8..69f4546b40d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -689,7 +689,7 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */, CORBA::ULongLong label; if (!(cdr >> label)) return false; - + typedef TypeCode::Case_T<CORBA::ULongLong, CORBA::String_var, CORBA::TypeCode_var> case_type; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp index 120cec2326c..21e97d61939 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.cpp @@ -57,20 +57,20 @@ TAO::TypeCode::Case_Enum_T<StringType, { CORBA::Any_var any = tc->member_label (index); TAO_OutputCDR out_cdr; - + if (! any->impl ()->marshal_value (out_cdr)) { return false; } - + TAO_InputCDR in_cdr (out_cdr); CORBA::ULong tc_label = ACE_UINT32_MAX; - + if (! in_cdr.read_ulong (tc_label)) { return false; } - + return (this->label_ == tc_label); } diff --git a/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h b/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h index 20b44708ac0..7783ef0919d 100644 --- a/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h +++ b/TAO/tao/AnyTypeCode/Vector_AnyOp_T.h @@ -9,7 +9,7 @@ * * @author Jeff Parsons */ - + #include <vector> TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -24,8 +24,8 @@ namespace TAO const std::vector<T> &) { } - - /// Non-copying + + /// Non-copying template<typename T> void insert_value_vector ( @@ -33,7 +33,7 @@ namespace TAO std::vector<T> *) { } - + template<typename T> bool extract_value_vector ( @@ -41,7 +41,7 @@ namespace TAO std::vector<T> &) { return true; - } + } /// Copying template<typename T> @@ -51,7 +51,7 @@ namespace TAO const std::vector<typename T::_ptr_type> &) { } - + /// Non-copying template<typename T> void @@ -60,7 +60,7 @@ namespace TAO std::vector<typename T::_ptr_type> *) { } - + template<typename T> bool extract_objref_vector ( @@ -68,7 +68,7 @@ namespace TAO std::vector<typename T::_ptr_type> &) { return true; - } + } /// Copying template<typename T_forany> @@ -78,7 +78,7 @@ namespace TAO const std::vector<typename T_forany::_slice_type *> &) { } - + /// Non-copying template<typename T_forany> void @@ -87,7 +87,7 @@ namespace TAO std::vector<typename T_forany::_slice_type *> *) { } - + template<typename T_forany> bool extract_array_vector ( @@ -95,7 +95,7 @@ namespace TAO std::vector<typename T_forany::_slice_type *> &) { return true; - } + } } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 8df6b85d77c..55f86d70d84 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -105,7 +105,7 @@ ANYTYPECODE__EXCEPTION_LIST virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar) = 0; virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar) = 0; - + virtual void insert_into_any (CORBA::Any * any, const std::string & value) = 0; virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) = 0; diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index d1b386ce72b..904c3d96a29 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -155,7 +155,7 @@ public: ); _out_type out (void); - + private: // Some compilers don't look into the base class when parsing // templates unless they are force to. @@ -188,7 +188,7 @@ public: _out_type out (void); operator _slice_type *& (); - + private: // Some compilers don't look into the base class when parsing // templates unless they are force to. diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h index 0dcb6a5722a..153c977dd90 100644 --- a/TAO/tao/Basic_Arguments.h +++ b/TAO/tao/Basic_Arguments.h @@ -131,7 +131,7 @@ namespace TAO TAO::Any_Insert_Policy_AnyTypeCode_Adapter> { }; - + template<> class TAO_Export Arg_Traits<std::string> : public diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp index 1c1b24bc9f3..dc9ccc4cb57 100644 --- a/TAO/tao/CDR.cpp +++ b/TAO/tao/CDR.cpp @@ -252,7 +252,7 @@ TAO_OutputCDR::fragment_stream (ACE_CDR::ULong pending_alignment, -int +int TAO_OutputCDR::offset (char* pos) { int offset = 0; diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index a0228ac2e03..81737e05e0b 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -279,7 +279,7 @@ private: /// Request/reply send timeout. ACE_Time_Value * timeout_; //@} - + /// These maps are used by valuetype indirection support. Repo_Id_Map_Handle repo_id_map_; #ifdef TAO_HAS_VALUETYPE_CODEBASE diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h index c24c68fb561..7da5ce7a45a 100644 --- a/TAO/tao/CORBA_methods.h +++ b/TAO/tao/CORBA_methods.h @@ -57,7 +57,7 @@ namespace CORBA { return x == 0; } - + template<typename T> inline void release (T x) { if (x != 0) diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp index d110dcf1d2c..7ba5827077a 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp @@ -36,7 +36,7 @@ TAO::CSD::TP_Cancel_Visitor::visit_request(TP_Request* request, request->cancel(); } - // Since we are either cancelling requests to any servant or a + // Since we are either cancelling requests to any servant or a // specific servant, always continue visitation. return true; } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h index d9b2472e507..f4381bad0bd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h @@ -37,12 +37,12 @@ namespace TAO * @brief Used to extract/cancel request(s) from the queue. * * This visitor is used to cancel certain requests in the queue - * as they are visited. + * as they are visited. * * Note that this is currently implemented to cancel *all* * requests in the queue, or requests that are targeted for a specific - * servant. This could be extended in the future to perhaps - * cancel all requests that have the same operation name, or something + * servant. This could be extended in the future to perhaps + * cancel all requests that have the same operation name, or something * else. * */ diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h index 6cfa149f73a..a15461f6999 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h @@ -39,9 +39,9 @@ namespace TAO * * @brief Represents a "queue-able", collocated, asynchronous, * CORBA request. - * - * This kind request is one-way collocated request with the default - * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned + * + * This kind request is one-way collocated request with the default + * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned * before enqueuing and the "enqueuing" thread never blocks. */ class TAO_CSD_TP_Export TP_Collocated_Asynch_Request diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h index 9aa378290ac..6ff938d94cd 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h @@ -43,8 +43,8 @@ namespace TAO * * @brief Base class for all custom request operations. * - * @note The caller that creates a new TP_Custom_Request_Operation - * object needs call _add_ref () on the servant before + * @note The caller that creates a new TP_Custom_Request_Operation + * object needs call _add_ref () on the servant before * constructing it and the TP_Custom_Request_Operation object * is responsible to decrement the reference count. * diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h index 01aea59828a..302a8507676 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h @@ -46,7 +46,7 @@ namespace TAO * request that was saved off during visitation. A nil reference * (ie, a NULL pointer) will be returned if no dispatchable request * was found. - * + * */ class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h index f86467ae64d..59bb682b89c 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h @@ -43,7 +43,7 @@ namespace TAO * * This also provides a means to encapsulate each distinct algorithm * within a distinct subclass of TP_Queue_Visitor. - * + * */ class TAO_CSD_TP_Export TP_Queue_Visitor { diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h index 38af35b0a2a..e9fb300a287 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h @@ -48,7 +48,7 @@ namespace TAO * "servant requests" that can be inserted into a TP_Queue * object. */ - class TAO_CSD_TP_Export TP_Request + class TAO_CSD_TP_Export TP_Request : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { public: diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp index 659bfb6c67f..2639c96a6ce 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp @@ -20,7 +20,7 @@ bool TAO::CSD::TP_Task::add_request(TP_Request* request) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, false); - + if (!this->accepting_requests_) { ACE_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - " @@ -304,7 +304,7 @@ void TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); - + // Cancel the requests targeted for the provided servant. TP_Cancel_Visitor cancel_visitor(servant); this->queue_.accept_visitor(cancel_visitor); diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 27c12cc317a..4c0d0c04755 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -355,7 +355,7 @@ TAO_UTF16_BOM_Translator::write_wstring (ACE_OutputCDR & cdr, { // pre GIOP 1.2: include null terminator in length ACE_CDR::ULong l = len + 1; - + if (this->write_4 (cdr, &l)) { if (x != 0) diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 29de7c32653..7bb66f8b4e9 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -285,7 +285,7 @@ TAO_Connection_Handler::handle_input_internal ( { resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); } - + return return_value; } @@ -296,7 +296,7 @@ TAO_Connection_Handler::close_connection_eh (ACE_Event_Handler *eh) { return 1; } - + this->is_closed_ = true; // Save the ID for debugging messages diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index 6ab1dd4bac5..43c7f451e00 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -210,7 +210,7 @@ private: /// Once closed make sure the transport is not added back to the cache. /// This is distinct from the leader-follower state so it cannot be reset. bool is_closed_; - + /* * Hook to add instance members from derived class * onto base Connection_Handler class. Any further diff --git a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h index 2da10eedf3b..614d2f8853a 100644 --- a/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h +++ b/TAO/tao/DiffServPolicy/DiffServ_Network_Priority_Hook.h @@ -38,7 +38,7 @@ public: /// priority policy, so that it can be used for sending replies with the /// policy-specified DiffServ codepoint. /// - void update_network_priority (TAO_Root_POA &poa, + void update_network_priority (TAO_Root_POA &poa, TAO_POA_Policy_Set &poa_policy_set); /// This function is a hook, that is used by the POA's servant dispatcher diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h index e0eb9101ca7..5873eed40d3 100644 --- a/TAO/tao/DynamicInterface/Context.h +++ b/TAO/tao/DynamicInterface/Context.h @@ -49,10 +49,10 @@ namespace CORBA class NVList; typedef NVList *NVList_ptr; - + class Context; typedef Context * Context_ptr; - + class ContextList; typedef ContextList * ContextList_ptr; diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp index ee2614bd222..12d544cc1ef 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.cpp @@ -71,7 +71,7 @@ TAO_DII_Arguments_Converter_Impl::convert_request ( details->use_stub_args (false); } -void +void TAO_DII_Arguments_Converter_Impl::dsi_convert_request ( TAO_ServerRequest & server_request, TAO_OutputCDR & output) @@ -105,7 +105,7 @@ TAO_DII_Arguments_Converter_Impl::convert_reply ( this->dsi_convert_reply (server_request, input); } -void +void TAO_DII_Arguments_Converter_Impl::dsi_convert_reply ( TAO_ServerRequest & server_request, TAO_InputCDR & input) @@ -113,14 +113,14 @@ TAO_DII_Arguments_Converter_Impl::dsi_convert_reply ( TAO::NamedValue_Argument * _ret_val = static_cast<TAO::NamedValue_Argument *> ( server_request.operation_details ()->args()[0]); - + _ret_val->demarshal (input); - + CORBA::NVList_ptr lst = static_cast<TAO::NVList_Argument *> ( server_request.operation_details ()->args()[1])->arg (); - lst->_tao_decode (input, + lst->_tao_decode (input, CORBA::ARG_INOUT | CORBA::ARG_OUT); } diff --git a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h index b2b7d4dae47..53ee52c0b87 100644 --- a/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h +++ b/TAO/tao/DynamicInterface/DII_Arguments_Converter_Impl.h @@ -48,7 +48,7 @@ public: virtual void dsi_convert_request (TAO_ServerRequest & server_request, TAO_OutputCDR & output); - + virtual void convert_reply (TAO_ServerRequest & server_request, TAO::Argument * const args[], size_t nargs); diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index ea2f72c6ad3..51bc039a815 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -151,7 +151,7 @@ CORBA::Request::invoke (void) // If we returned without an exception being thrown the response // (if any) is assumed to be received. this->response_received_ = true; - + // If this request was created by a gateway, then result_ // and/or args_ are shared by a CORBA::ServerRequest, whose // reply must be in the same byte order as the reply we are diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp index 61fcdf1b15d..381bf8f035d 100644 --- a/TAO/tao/DynamicInterface/Server_Request.cpp +++ b/TAO/tao/DynamicInterface/Server_Request.cpp @@ -74,23 +74,23 @@ CORBA::ServerRequest::arguments (CORBA::NVList_ptr &list) throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 7, CORBA::COMPLETED_NO); } - // In a collocated situation there will not be an incoming CDR stream - // in which case we can get the arguments from the + // In a collocated situation there will not be an incoming CDR stream + // in which case we can get the arguments from the // operation_details using the 'collocated argument converter'. if (this->orb_server_request_.collocated ()) { this->params_ = list; - + if (this->orb_server_request_.operation_details ()->cac () != 0) { TAO_OutputCDR output; this->orb_server_request_.operation_details ()->cac ( )->dsi_convert_request (this->orb_server_request_, output); - + TAO_InputCDR input(output); this->params_->_tao_decode (input, CORBA::ARG_IN | CORBA::ARG_INOUT); - } + } } else { @@ -191,7 +191,7 @@ CORBA::ServerRequest::dsi_marshal (void) output, CORBA::ARG_INOUT | CORBA::ARG_OUT); } - + TAO_InputCDR input (output); // set reply parameters this->orb_server_request_.operation_details ()->cac ( diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp index 59fadfe0902..f3657585eea 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp @@ -386,7 +386,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs) { if ((ACE_CDR::Double) rhs == 0.0) return TAO_ETCL_Literal_Constraint ((ACE_CDR::Double) 0.0); - + CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; return TAO_ETCL_Literal_Constraint ((CORBA::Double) result); } @@ -395,7 +395,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs) { if ((ACE_CDR::Long) rhs == 0) return TAO_ETCL_Literal_Constraint ((ACE_CDR::Long) 0); - + CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs; return TAO_ETCL_Literal_Constraint ((CORBA::Long) result); } @@ -439,12 +439,12 @@ TAO_ETCL_Literal_Constraint::widest_type ( if (rhs_type == ACE_ETCL_COMPONENT) { const TAO_ETCL_Literal_Constraint& actual = - dynamic_cast<const TAO_ETCL_Literal_Constraint&> (rhs); + dynamic_cast<const TAO_ETCL_Literal_Constraint&> (rhs); CORBA::TypeCode_var tc = actual.any_->type (); rhs_type = TAO_ETCL_Literal_Constraint::comparable_type (tc.in ()); return return_value; } - + return this->ETCL_Literal_Constraint::widest_type (rhs); } diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h index 5eea21c1e1b..e4f27db478c 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter.h @@ -6,7 +6,7 @@ * * $Id$ * - * Subclass of TAO_Default_Acceptor_Filter that populates mprofile and filters + * Subclass of TAO_Default_Acceptor_Filter that populates mprofile and filters * mprofile with the endpoint policy in TAO_POA_Manager. * * @author Yan Dai <dai_y@ociweb.com> @@ -48,7 +48,7 @@ class TAO_EndpointPolicy_Export TAO_Endpoint_Acceptor_Filter public: TAO_Endpoint_Acceptor_Filter (const EndpointPolicy::EndpointList & eps); - /// Populate @a mprofile with endpoints match the POAManager endpoint + /// Populate @a mprofile with endpoints match the POAManager endpoint /// policy. int fill_profile (const TAO::ObjectKey &object_key, TAO_MProfile &mprofile, diff --git a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp index a8ff981c859..12d8ddf9a20 100644 --- a/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp +++ b/TAO/tao/EndpointPolicy/Endpoint_Acceptor_Filter_Factory.cpp @@ -29,7 +29,7 @@ TAO_Endpoint_Acceptor_Filter_Factory::~TAO_Endpoint_Acceptor_Filter_Factory(void EndpointPolicy::Policy_var cur_policy = EndpointPolicy::Policy::_narrow (policies[i]); if (CORBA::is_nil (cur_policy.in ())) return 0; - + EndpointPolicy::EndpointList_var cur_endpoints = cur_policy->value (); CORBA::ULong cur_num_endpoints = cur_endpoints->length (); diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index c2b51ce77b7..d81a7fb5194 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -150,7 +150,7 @@ namespace CORBA /// The previous environment on the "default environment stack". Environment *previous_; }; - + template<> inline void release (Environment_ptr env) { diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp index 3d5f604cbb7..16a54cde037 100644 --- a/TAO/tao/Exclusive_TMS.cpp +++ b/TAO/tao/Exclusive_TMS.cpp @@ -116,7 +116,7 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id) // did not find the right reply handler. return 0; } - + ACE_Intrusive_Auto_Ptr<TAO_Reply_Dispatcher> rd (this->rd_.get ()); this->request_id_ = 0; // @@ What is a good value??? this->rd_.release (); diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp index 1530495fe93..8cf76e4d536 100644 --- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp +++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp @@ -23,7 +23,7 @@ namespace TAO CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, TAO::Objref_Traits<CORBA::InterfaceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index b4c0c44bfe4..a736378f6c4 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -31,8 +31,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Template class as wrapper of a non reference counted data type but provide * intrusive reference-counting feature by inherited from TAO_Intrusive_Ref_Count_Base. - * This makes the parameterized type data be smart pointer by using a - * TAO_Intrusive_Ref_Count_Handle<X> to an this wrapper object. + * This makes the parameterized type data be smart pointer by using a + * TAO_Intrusive_Ref_Count_Handle<X> to an this wrapper object. */ template <class OBJ, class ACE_LOCK> class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_LOCK> diff --git a/TAO/tao/Invocation_Utils.h b/TAO/tao/Invocation_Utils.h index f0593cf5eb6..54e8ec6a0c5 100644 --- a/TAO/tao/Invocation_Utils.h +++ b/TAO/tao/Invocation_Utils.h @@ -74,10 +74,10 @@ namespace TAO enum Forward_Once_Exception { FOE_NON = 0x0, - FOE_OBJECT_NOT_EXIST = 0x1, - FOE_COMM_FAILURE = 0x2, - FOE_TRANSIENT = 0x4, - FOE_INV_OBJREF = 0x8, + FOE_OBJECT_NOT_EXIST = 0x1, + FOE_COMM_FAILURE = 0x2, + FOE_TRANSIENT = 0x4, + FOE_INV_OBJREF = 0x8, FOE_ALL = 0xFFFFFFFF }; } diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index a7577787543..a191515d3da 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -40,7 +40,7 @@ TAO_AMI_Arguments_Converter_Impl::convert_request ( details->use_stub_args (false); } -void +void TAO_AMI_Arguments_Converter_Impl::dsi_convert_request ( TAO_ServerRequest & server_request, TAO_OutputCDR & output) @@ -78,7 +78,7 @@ TAO_AMI_Arguments_Converter_Impl::convert_reply ( } } -void +void TAO_AMI_Arguments_Converter_Impl::dsi_convert_reply ( TAO_ServerRequest & server_request, TAO_InputCDR & input) diff --git a/TAO/tao/Monitor/Monitor.cpp b/TAO/tao/Monitor/Monitor.cpp index 735bba8cecd..6258b199287 100644 --- a/TAO/tao/Monitor/Monitor.cpp +++ b/TAO/tao/Monitor/Monitor.cpp @@ -46,7 +46,7 @@ TAO_Monitor_Init::create_object (CORBA::ORB_ptr orb, catch (const CORBA::Exception&) { } - + return CORBA::Object::_nil (); } diff --git a/TAO/tao/Monitor/Monitor.h b/TAO/tao/Monitor/Monitor.h index 3e2ad6c4055..2121871a6a0 100644 --- a/TAO/tao/Monitor/Monitor.h +++ b/TAO/tao/Monitor/Monitor.h @@ -37,11 +37,11 @@ class TAO_Monitor_Export TAO_Monitor_Init : public TAO_Object_Loader { public: TAO_Monitor_Init (void); - + virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv []); - + /// Used to force the initialization of the ORB code. static int Initializer (void); }; diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index f031417a061..e561e9a8f19 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -70,7 +70,7 @@ namespace CORBA class UnionMemberSeq; class ValueMemberSeq; class ORB_ObjectIdList; - + class Object; typedef Object * Object_ptr; @@ -91,7 +91,7 @@ namespace CORBA class Policy; typedef Policy *Policy_ptr; - + class OperationDef; typedef OperationDef * OperationDef_ptr; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index df1c1db2eed..0527ea0011b 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -2306,7 +2306,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion) // Cleanup transports this->thread_lane_resources_manager ().close_all_transports (); - + // Grab the thread manager ACE_Thread_Manager *tm = this->thr_mgr (); diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 57aa973a879..38bebc56ef1 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -931,7 +931,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x) { return false; } - + ACE_NEW_RETURN (x, CORBA::Object (ior, orb_core), false); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index fcc85c53ffd..a08df8e3c77 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -83,10 +83,10 @@ namespace CORBA class Object; typedef Object *Object_ptr; - + typedef TAO_Pseudo_Var_T<Object> Object_var; typedef TAO_Pseudo_Out_T<Object> Object_out; - + template<> TAO_Export Boolean is_nil<> (Object_ptr); @@ -342,9 +342,9 @@ namespace CORBA /// implement Smart Proxies and no others. virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; - + /// Wrapper for _remove_ref(), naming convention for - /// templatizing. + /// templatizing. void _decr_refcount (void); protected: diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp index ba611cec358..181915cd4b8 100644 --- a/TAO/tao/PI/PolicyFactoryA.cpp +++ b/TAO/tao/PI/PolicyFactoryA.cpp @@ -46,7 +46,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0", "PolicyFactory"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_PolicyFactory = diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp index 8f5dfb63340..6f35a3004d8 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp @@ -47,7 +47,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0", "ServerRequestInterceptor"); - + namespace PortableInterceptor { ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor = diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index 396459a94d7..0d3c5627e10 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -19,14 +19,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /* static */ size_t TAO_Active_Object_Map::system_id_size_ = 0; -static void +static void hexstring (ACE_CString& hexstr, const char* s, size_t l) { char buf[3] = {0}; - + hexstr.fast_resize (2 + l * 2); hexstr.append ("0x", 2); - while (--l) + while (--l) { ACE_OS::sprintf (buf, "%02x", (unsigned int)(unsigned char)*s); hexstr.append (buf, 2); diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp index efaca76332e..51ecf7596c6 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.cpp +++ b/TAO/tao/PortableServer/PS_ForwardA.cpp @@ -45,7 +45,7 @@ static TAO::TypeCode::Alias<char const *, "IDL:omg.org/PortableServer/ObjectId:2.3", "ObjectId", &CORBA::_tc_OctetSeq); - + namespace PortableServer { ::CORBA::TypeCode_ptr const _tc_ObjectId = diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h index 047e66c649b..686a57ce704 100644 --- a/TAO/tao/PortableServer/PS_ForwardA.h +++ b/TAO/tao/PortableServer/PS_ForwardA.h @@ -45,10 +45,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace PortableServer { - + // TAO_IDL - Generated from // be\be_visitor_typecode/typecode_decl.cpp:49 - + extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId; // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 1161d814c19..29c81c7860d 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -109,7 +109,7 @@ namespace TAO CORBA::Policy_var, CORBA::Policy_out, TAO::Objref_Traits<CORBA::Policy>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp index dfe7cbabbdd..312a1e2f507 100644 --- a/TAO/tao/PortableServer/PolicyS_T.cpp +++ b/TAO/tao/PortableServer/PolicyS_T.cpp @@ -25,7 +25,7 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -// TAO_IDL - Generated from +// TAO_IDL - Generated from // be\be_codegen.cpp:677 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_ diff --git a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp index 3c46176ee91..717acb9244a 100644 --- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp +++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp @@ -96,12 +96,12 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, { if ( this->min_ < this->max_ ) { - native_priority = static_cast<RTCORBA::NativePriority> + native_priority = static_cast<RTCORBA::NativePriority> (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_); } else { - native_priority = static_cast<RTCORBA::NativePriority> + native_priority = static_cast<RTCORBA::NativePriority> (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_); } } @@ -127,7 +127,7 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority, last_priority = this->base_native_priority_; for (int current_ndx = 0; current_ndx < priority_ndx; current_ndx++) { - native_priority = static_cast<RTCORBA::NativePriority> + native_priority = static_cast<RTCORBA::NativePriority> (ACE_Sched_Params::previous_priority (this->policy_, last_priority, ACE_SCOPE_THREAD)); @@ -167,12 +167,12 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, { if ( this->min_ < this->max_ ) { - corba_priority = static_cast<RTCORBA::Priority> + corba_priority = static_cast<RTCORBA::Priority> (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_); } else { - corba_priority = static_cast<RTCORBA::Priority> + corba_priority = static_cast<RTCORBA::Priority> (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_); } } @@ -226,7 +226,7 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority, priority_ndx++; } - corba_priority = static_cast<RTCORBA::Priority> + corba_priority = static_cast<RTCORBA::Priority> (base_corba_priority_ - priority_ndx); } } diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp index 4411903d74b..4e0105c6e0e 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesA.cpp @@ -47,7 +47,7 @@ static TAO::TypeCode::Objref<char const *, ::CORBA::tk_local_interface, "IDL:omg.org/RTCORBA/ProtocolProperties:1.0", "ProtocolProperties"); - + namespace RTCORBA { ::CORBA::TypeCode_ptr const _tc_ProtocolProperties = @@ -87,7 +87,7 @@ namespace TAO { return false; } - + template<> ::CORBA::Boolean Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &) @@ -107,8 +107,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace RTCORBA { - - + + /// Copying insertion. void operator<<= ( @@ -119,7 +119,7 @@ namespace RTCORBA ProtocolProperties::_duplicate (_tao_elem); _tao_any <<= &_tao_objptr; } - + /// Non-copying insertion. void operator<<= ( @@ -132,7 +132,7 @@ namespace RTCORBA _tc_ProtocolProperties, *_tao_elem); } - + ::CORBA::Boolean operator>>= ( const ::CORBA::Any &_tao_any, diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp index ab48b2c8adc..28975f801e2 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.cpp @@ -99,7 +99,7 @@ RTCORBA::ProtocolProperties::ProtocolProperties (void) RTCORBA::ProtocolProperties::~ProtocolProperties (void) {} -void +void RTCORBA::ProtocolProperties::_tao_any_destructor (void *_tao_void_pointer) { ProtocolProperties *_tao_tmp_pointer = @@ -134,7 +134,7 @@ RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj) { obj->_add_ref (); } - + return obj; } diff --git a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h index e1778a0198b..82277225334 100644 --- a/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h +++ b/TAO/tao/RTCORBA/RT_ProtocolPropertiesC.h @@ -63,22 +63,22 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace RTCORBA { - + // TAO_IDL - Generated from // be\be_interface.cpp:638 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_) #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_ - + class ProtocolProperties; typedef ProtocolProperties *ProtocolProperties_ptr; - + typedef TAO_Objref_Var_T< ProtocolProperties > ProtocolProperties_var; - + typedef TAO_Objref_Out_T< ProtocolProperties @@ -86,13 +86,13 @@ namespace RTCORBA ProtocolProperties_out; #endif /* end #if !defined */ - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:54 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_) #define _RTCORBA_PROTOCOLPROPERTIES_CH_ - + class TAO_RTCORBA_Export ProtocolProperties : public virtual ::CORBA::Object { @@ -100,24 +100,24 @@ namespace RTCORBA typedef ProtocolProperties_ptr _ptr_type; typedef ProtocolProperties_var _var_type; typedef ProtocolProperties_out _out_type; - + // The static operations. static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj); - + static void _tao_release (ProtocolProperties_ptr obj); - + static ProtocolProperties_ptr _narrow (::CORBA::Object_ptr obj); static ProtocolProperties_ptr _unchecked_narrow (::CORBA::Object_ptr obj); static ProtocolProperties_ptr _nil (void) { return static_cast<ProtocolProperties_ptr> (0); } - + static void _tao_any_destructor (void *); - + // TAO_IDL - Generated from // be\be_visitor_interface/interface_ch.cpp:216 - + virtual ::CORBA::Boolean _is_a (const char *type_id); virtual const char* _interface_repository_id (void) const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); @@ -129,13 +129,13 @@ namespace RTCORBA protected: // Abstract or local interface only. ProtocolProperties (void); - + virtual ~ProtocolProperties (void); - + private: // Private and unimplemented for concrete interfaces. ProtocolProperties (const ProtocolProperties &); - + void operator= (const ProtocolProperties &); }; @@ -161,7 +161,7 @@ namespace TAO #if !defined (_RTCORBA_PROTOCOLPROPERTIES__TRAITS_) #define _RTCORBA_PROTOCOLPROPERTIES__TRAITS_ - + template<> struct TAO_RTCORBA_Export Objref_Traits< ::RTCORBA::ProtocolProperties> { diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h index 8e5ae0fe5ff..8f7359407f6 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h @@ -58,7 +58,7 @@ public: /// Shutdown reactor. void shutdown_reactor (void); - /// Certain ORB policies such as dropping replies on shutdown + /// Certain ORB policies such as dropping replies on shutdown /// would need cleanup of transports to wake threads up. void close_all_transports (void); diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 700d3f5c8e7..09d87b13dfc 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -39,7 +39,7 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd) if (rd != 0) { long tmp = --rd->refcnt_; - if (tmp <= 0) + if (tmp <= 0) { if (rd->allocator_) { @@ -51,7 +51,7 @@ TAO_Reply_Dispatcher::intrusive_remove_ref (TAO_Reply_Dispatcher* rd) { delete rd; } - } + } } } diff --git a/TAO/tao/Service_Context_Handler.h b/TAO/tao/Service_Context_Handler.h index 6c6430ef7d5..ea0399a5ced 100644 --- a/TAO/tao/Service_Context_Handler.h +++ b/TAO/tao/Service_Context_Handler.h @@ -41,9 +41,9 @@ class TAO_Export TAO_Service_Context_Handler virtual int process_service_context ( TAO_Transport& transport, const IOP::ServiceContext& context) = 0; - + virtual int generate_service_context ( - TAO_Stub *stub, + TAO_Stub *stub, TAO_Transport& transport, TAO_Operation_Details &opdetails, TAO_Target_Specification &spec, diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index 5affe968bb9..a4b285fcc9f 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -498,7 +498,7 @@ namespace TAO mon.set_status (TAO_INVOKE_USER_EXCEPTION); // We must manage the memory allocated - // by the call above to alloc(). + // by the call above to alloc(). auto_ptr<CORBA::Exception> safety (exception); exception->_raise (); diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 47b9ad4b09b..adb0ad8cbce 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -354,7 +354,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) ACE_TEXT ("TAO (%P|%t) - process-wide service ") ACE_TEXT ("configuration context had %d failed ") ACE_TEXT ("directives\n"), status)); - } + } } if (TAO_debug_level > 2) @@ -516,7 +516,7 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, ACE_TEXT ("TAO (%P|%t) - ORB-specific service ") ACE_TEXT ("configuration context had %d failed ") ACE_TEXT ("directives\n"), status)); - } + } } diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 9fafb76c799..fac8a42fa56 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -53,7 +53,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id, const ACE_TCHAR *location) { ACE_GUARD (ACE_Log_Msg, ace_mon, *ACE_Log_Msg::instance ()); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ") ACE_TEXT ("sending %d buffers\n"), @@ -202,7 +202,7 @@ TAO_Transport::~TAO_Transport (void) this->id_ )); } - + delete this->messaging_object_; delete this->ws_; @@ -490,7 +490,7 @@ TAO_Transport::purge_entry (void) entry = this->cache_map_entry_; this->cache_map_entry_ = 0; } - + if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index 0c8d325d82c..0d6084c8272 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -81,9 +81,9 @@ namespace TAO * application level policies in effect. * * Some examples: - * + * * # When idle, the ORB will want to send data on any socket that has - * space available. In this case, the queue must be drained on + * space available. In this case, the queue must be drained on * a best-effort basis, without any blocking. * # If the ORB is configured to handle nested upcalls, any two-way * request should block and push data to the underlying socket as fast @@ -1057,14 +1057,14 @@ private: * on the current flushing and waiting strategies. */ bool using_blocking_io_for_synch_messages() const; - + /** * Return true if blocking I/O should be used for sending asynchronous * (AMI calls, non-blocking oneways, responses to operations, etc.) * messages. This is determined based on the current flushing strategy. */ bool using_blocking_io_for_asynch_messages() const; - + /* * Specialization hook to add concrete private methods from * TAO's protocol implementation onto the base Transport class diff --git a/TAO/tao/TransportCurrent/Transport_Current_Export.h b/TAO/tao/TransportCurrent/Transport_Current_Export.h index 8a80e0992f8..44c2f497a71 100644 --- a/TAO/tao/TransportCurrent/Transport_Current_Export.h +++ b/TAO/tao/TransportCurrent/Transport_Current_Export.h @@ -1,6 +1,6 @@ // -*- C++ -*- -// $Id:$ +// $Id$ // Definition for Win32 Export directives. // This file is generated automatically by generate_export_file.pl -d TAO_Transport_Current // ------------------------------ diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h index 94a2eecb49e..ea73d5832d2 100644 --- a/TAO/tao/Valuetype/AbstractBase.h +++ b/TAO/tao/Valuetype/AbstractBase.h @@ -88,7 +88,7 @@ namespace CORBA virtual const char* _interface_repository_id (void) const; /// TAO specific operations - + virtual const char* _tao_obv_repository_id (void) const; virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &strm) const; virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &strm); @@ -97,11 +97,11 @@ namespace CORBA #if defined (GEN_OSTREAM_OPS) /// Used by optionally generated ostream operators for interface - /// to output the actual repo id for debugging. + /// to output the actual repo id for debugging. static std::ostream& _tao_stream (std::ostream &strm, const AbstractBase_ptr _tao_objref); virtual std::ostream& _tao_stream_v (std::ostream &strm) const; - + #endif /* GEN_OSTREAM_OPS */ /// Memmory management operations @@ -127,7 +127,7 @@ namespace CORBA CORBA::Object_ptr equivalent_objref (void); /// Wrapper for _remove_ref(), naming convention for - /// templatizing. + /// templatizing. void _decr_refcount (void); protected: diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 65647ffda94..7ff6ffda25b 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -131,7 +131,7 @@ namespace CORBA typedef ValueBase_out _out_type; typedef ACE_Vector < ACE_CString > Repository_Id_List; - + // Reference counting. /// %! virtual CORBA::ValueBase* _copy_value (void) = 0; diff --git a/TAO/tao/Vector_CDR_T.h b/TAO/tao/Vector_CDR_T.h index e9a49b9bbe1..c956e9c91ae 100644 --- a/TAO/tao/Vector_CDR_T.h +++ b/TAO/tao/Vector_CDR_T.h @@ -61,7 +61,7 @@ namespace TAO return false; } - std::vector<T> tmp; + std::vector<T> tmp; tmp.reserve (new_length); T tmp_elem; @@ -163,7 +163,7 @@ namespace TAO i != source.end (); ++i) { - var_type tmp_array = + var_type tmp_array = TAO::Array_Traits<T_forany>::dup (*i); T_forany const tmp (tmp_array.inout ()); diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp index 61d261f4d0a..73422d1c081 100644 --- a/TAO/tao/ZIOP/ZIOP_Stub.cpp +++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp @@ -198,57 +198,57 @@ TAO_ZIOP_Stub::effective_compression_id_list_policy (void) return exposed._retn (); // Check which compressor id we should use and which level - for (CORBA::ULong nr_exposed = 0; - nr_exposed < exposed_policy_var->compressor_ids ()->length (); + for (CORBA::ULong nr_exposed = 0; + nr_exposed < exposed_policy_var->compressor_ids ()->length (); ++nr_exposed) { - ::Compression::CompressorIdLevel_var exposed_compressor = + ::Compression::CompressorIdLevel_var exposed_compressor = exposed_policy_var->compressor_ids ()->operator [](nr_exposed); if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("exposed_policy = %d, compressor_id = %C, ") - ACE_TEXT ("compression_level = %d\n"), - nr_exposed, + ACE_TEXT ("compression_level = %d\n"), + nr_exposed, TAO_ZIOP_Loader::ziop_compressorid_name ( exposed_compressor.ptr ()->compressor_id), exposed_compressor.ptr ()->compression_level)); } // check if a local policy matches this exposed policy - for (CORBA::ULong nr_override = 0; - nr_override < override_policy_var->compressor_ids ()->length (); + for (CORBA::ULong nr_override = 0; + nr_override < override_policy_var->compressor_ids ()->length (); ++nr_override) { - ::Compression::CompressorIdLevel_var override_compressor = + ::Compression::CompressorIdLevel_var override_compressor = override_policy_var->compressor_ids ()->operator [] (nr_override); if (TAO_debug_level > 9) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - ") ACE_TEXT ("TAO_ZIOP_Stub::effective_compression_id_list_policy, ") ACE_TEXT ("checking override_policy = %d, compressor_id = %C, ") - ACE_TEXT ("compression_level = %d\n"), - nr_override, + ACE_TEXT ("compression_level = %d\n"), + nr_override, TAO_ZIOP_Loader::ziop_compressorid_name ( override_compressor->compressor_id), override_compressor->compression_level)); } - if (override_compressor->compressor_id == + if (override_compressor->compressor_id == exposed_compressor->compressor_id) - { + { CORBA::Policy_var tmp_policy = override_policy_var->copy (); ZIOP::CompressorIdLevelListPolicy_var idlevellist_policy_var = ZIOP::CompressorIdLevelListPolicy::_narrow (tmp_policy.in ()); if (CORBA::is_nil (idlevellist_policy_var.in ())) return override._retn (); - idlevellist_policy_var->compressor_ids ()->operator [] (0).compressor_id = + idlevellist_policy_var->compressor_ids ()->operator [] (0).compressor_id = override_compressor->compressor_id; - //according to ZIOP spec, return the compressor with the lowest compression level. - idlevellist_policy_var.ptr ()->compressor_ids ()->operator [] (0).compression_level = + //according to ZIOP spec, return the compressor with the lowest compression level. + idlevellist_policy_var.ptr ()->compressor_ids ()->operator [] (0).compression_level = ACE_MIN (override_compressor->compression_level, exposed_compressor->compression_level); |