diff options
669 files changed, 3826 insertions, 3826 deletions
diff --git a/TAO/DevGuideExamples/AMH_AMI/run_test.pl b/TAO/DevGuideExamples/AMH_AMI/run_test.pl index 1e73cf21dc8..3747df0fa09 100755 --- a/TAO/DevGuideExamples/AMH_AMI/run_test.pl +++ b/TAO/DevGuideExamples/AMH_AMI/run_test.pl @@ -38,11 +38,11 @@ $md_server->DeleteFile($middle_ior); my $client_iorfile = $client->LocalFile ($middle_ior); $client->DeleteFile($middle_ior); -$IS = $in_server->CreateProcess ("inner_server", +$IS = $in_server->CreateProcess ("inner_server", "-ORBdebuglevel $debug_level " . "-o $in_server_inner_ior"); -$MD = $md_server->CreateProcess ("middle_server", +$MD = $md_server->CreateProcess ("middle_server", "-ORBdebuglevel $debug_level " . "-o $md_server_middle_ior " . "-i file://$md_server_inner_ior"); diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp index 27d02a450dc..9c3f7306a6f 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp @@ -25,6 +25,6 @@ CORBA::Boolean Messenger_i::send_message ( CORBA::string_free(message); message = CORBA::string_dup("Thanks for the message."); return true; - + } diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl index 17f625393f0..6488044fc67 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/Messenger.idl @@ -8,7 +8,7 @@ exception MessengerUnableToSendMessage interface Messenger { - + boolean send_message(in string user_name, in string subject, inout string message, diff --git a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp index 9ede1f8097b..d2cd1ef0502 100644 --- a/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp +++ b/TAO/DevGuideExamples/Messaging/AMIcallback/MessengerClient.cpp @@ -74,7 +74,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) mgr->activate(); // Register an AMI handler for the Messenger interface - PortableServer::Servant_var<MessengerHandler> servant = + PortableServer::Servant_var<MessengerHandler> servant = new MessengerHandler(orb.in()); PortableServer::ObjectId_var oid = poa->activate_object(servant.in()); obj = poa->id_to_reference(oid.in()); diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp index 1843bc73b98..48b503ce45d 100644 --- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/Messenger_i.cpp @@ -14,12 +14,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp index 4fae956687b..23d2653fcfc 100644 --- a/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp +++ b/TAO/DevGuideExamples/Multithreading/Reactive/Messenger_i.cpp @@ -13,12 +13,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp index 42bb29ef004..25b9700c4a9 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ServerIORInterceptor.cpp @@ -45,7 +45,7 @@ ServerIORInterceptor::components_established ( void ServerIORInterceptor::adapter_manager_state_changed ( - const char* /*id*/, + const char* /*id*/, PortableInterceptor::AdapterState /*state*/) { } diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp index 9b8850a173c..0e869a4ff00 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp @@ -81,7 +81,7 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) } else { std::cerr << "Could not extract a boolean value from any" << std::endl; } - + // Add this context to the service context list. ri->add_request_service_context (sc, false); diff --git a/TAO/DevGuideExamples/SmartProxies/Logger.idl b/TAO/DevGuideExamples/SmartProxies/Logger.idl index b800e926afc..3b144588056 100644 --- a/TAO/DevGuideExamples/SmartProxies/Logger.idl +++ b/TAO/DevGuideExamples/SmartProxies/Logger.idl @@ -1,4 +1,4 @@ -// $Id$ +// $Id$ // Logger.idl diff --git a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp index 4322b6397a4..a3572439088 100644 --- a/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp +++ b/TAO/DevGuideExamples/SmartProxies/Smart_Messenger_Proxy.cpp @@ -51,7 +51,7 @@ Smart_Messenger_Proxy::send_message ( char *& message) { logger_->log_message("Before send_message()"); - CORBA::Boolean ret_val = + CORBA::Boolean ret_val = TAO_Messenger_Smart_Proxy_Base::send_message(user_name, subject, message); logger_->log_message("After send_message()"); return ret_val; diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp index 3dc5a20807e..15a1dfed447 100644 --- a/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/ValueTypes/Messenger/Messenger_i.cpp @@ -6,7 +6,7 @@ #include <sstream> - + CORBA::Boolean Messenger_i::send_message (Message*& msg) { msg->print(); diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index ba801392419..848c3b06366 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -135,10 +135,10 @@ AST_Array::compute_dims (UTL_ExprList *ds, { AST_Expression *orig = iter.item (); AST_Param_Holder *ph = orig->param_holder (); - + AST_Expression::ExprType ex_type = (ph == 0 ? orig->ev ()->et : ph->info ()->const_type_); - + AST_Expression *copy = 0; ACE_NEW_RETURN (copy, AST_Expression (orig, @@ -256,11 +256,11 @@ AST_Array::destroy (void) delete this->pd_dims[i]; this->pd_dims[i] = 0; } - + delete [] this->pd_dims; this->pd_dims = 0; this->pd_n_dims = 0; - + this->AST_ConcreteType::destroy (); } diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp index 0c9d5036ce6..795b63fc5f3 100644 --- a/TAO/TAO_IDL/ast/ast_attribute.cpp +++ b/TAO/TAO_IDL/ast/ast_attribute.cpp @@ -114,7 +114,7 @@ AST_Attribute::dump (ACE_OSTREAM_TYPE &o) this->dump_i (o, (this->pd_readonly == true ? "readonly attribute " : "attribute ")); - + this->AST_Field::dump (o); } @@ -137,7 +137,7 @@ AST_Attribute::destroy (void) this->pd_get_exceptions->destroy (); this->pd_get_exceptions = 0; } - + if (this->pd_set_exceptions != 0) { this->pd_set_exceptions->destroy (); @@ -223,7 +223,7 @@ AST_Attribute::fe_add_get_exceptions (UTL_NameList *t) idl_global->err ()->lookup_error (nl_n); return 0; } - + AST_Decl::NodeType nt = d->node_type (); if (nt != AST_Decl::NT_except @@ -276,7 +276,7 @@ AST_Attribute::fe_add_set_exceptions (UTL_NameList *t) idl_global->err ()->lookup_error (nl_n); return 0; } - + AST_Decl::NodeType nt = d->node_type (); if (nt != AST_Decl::NT_except diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp index fd68d16fc5e..6b4dc9bc6a9 100644 --- a/TAO/TAO_IDL/ast/ast_component.cpp +++ b/TAO/TAO_IDL/ast/ast_component.cpp @@ -72,7 +72,7 @@ AST_Component::look_in_inherited (UTL_ScopedName *e, bool full_def_only) { AST_Decl *d = 0; - + if (this->pd_base_component != 0) { d = @@ -148,15 +148,15 @@ AST_Component::special_lookup (UTL_ScopedName *e, bool full_def_only) { AST_Decl *d = this->look_in_inherited (e, full_def_only); - + if (d == 0) { d = this->look_in_supported (e, full_def_only); } - + return d; } - + void AST_Component::destroy (void) { diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index f8daab685bc..950743caa32 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -207,7 +207,7 @@ AST_Constant::destroy (void) delete this->pd_constant_value; this->pd_constant_value = 0; } - + this->AST_Decl::destroy (); } diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 5b5555c7f45..000d796aade 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -1274,7 +1274,7 @@ AST_Decl::set_name (UTL_ScopedName *n) } this->pd_name = n; - + if (n) { if (this->pd_local_name) diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp index 8af1434ec1c..93855da6494 100644 --- a/TAO/TAO_IDL/ast/ast_enum.cpp +++ b/TAO/TAO_IDL/ast/ast_enum.cpp @@ -264,7 +264,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t) t1->set_name (sn); } - + // Already defined and cannot be redefined? Or already used? if ((d = this->lookup_for_add (t)) != 0) { diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 9a366e7c4e1..1b0e777e906 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -106,11 +106,11 @@ AST_Expression::AST_Expression (UTL_ScopedName *nm) param_holder_ (0) { this->fill_definition_details (); - + AST_Decl *d = idl_global->scopes ().top_non_null ()->lookup_by_name (nm, true); - + if (d->node_type () == AST_Decl::NT_param_holder) { this->param_holder_ = @@ -1823,12 +1823,12 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek) ACE_NEW_RETURN (newval, AST_Expression::AST_ExprValue, 0); - + if (ev != 0) { *newval = *ev; } - + AST_Expression::AST_ExprValue *retval = 0; switch (ek) @@ -1868,9 +1868,9 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek) default: break; } - + // Sometimes the call above to coerce_value() will return an - // evaluated newval, other times 0. But a heap-allocated + // evaluated newval, other times 0. But a heap-allocated // ExprValue is not always passed to coerce_value(), so we // have to manage it here, where we know it is always a 'new'. if (retval != newval) @@ -1878,7 +1878,7 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek) delete newval; newval = 0; } - + return retval; } @@ -2173,7 +2173,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; case EK_longlong: { @@ -2207,7 +2207,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; #endif /* !defined (ACE_LACKS_LONGLONG_T) */ case EK_ulong: @@ -2242,7 +2242,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; case EK_long: { @@ -2274,9 +2274,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } - + break; case EK_ushort: { @@ -2310,7 +2310,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; case EK_short: { @@ -2342,9 +2342,9 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) break; default: return 0; - } + } } - + break; case EK_bool: { @@ -2378,7 +2378,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; case EK_octet: { @@ -2406,7 +2406,7 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) // even if both operands are in range, so we set the ExprType // to a large type and then check for overflow. retval->u.ulval = - this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval; + this->pd_v1->ev ()->u.ulval << this->pd_v2->ev ()->u.ulval; AST_Expression test (retval->u.ulval, EV_ulong); AST_ExprValue *ev = test.coerce (EV_octet); delete retval; @@ -2421,11 +2421,11 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek) return 0; } } - + break; default: return 0; - } + } return retval; } @@ -2560,10 +2560,10 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek) idl_global->err ()->lookup_error (this->pd_n); return 0; } - + // If we are a template parameter placeholder, just skip the // rest - nothing needs to be evaluated until instantiation - // time. + // time. if (this->param_holder_ != 0) { return 0; @@ -2864,7 +2864,7 @@ AST_Expression::evaluate (EvalKind ek) AST_ExprValue *tmp = eval_kind (this->pd_ev, ek); delete this->pd_ev; this->pd_ev = tmp; - + // Artifact of expressions doing double duty for all template // args. At this point, we have knowledge that we must be an // enum constant, so we set the expression type here, rather @@ -3311,7 +3311,7 @@ AST_Expression::destroy (void) delete this->pd_n; this->pd_n = 0; - + if (this->param_holder_ != 0) { this->param_holder_->destroy (); diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp index 347ec3470c9..6502ee8c86a 100644 --- a/TAO/TAO_IDL/ast/ast_factory.cpp +++ b/TAO/TAO_IDL/ast/ast_factory.cpp @@ -237,7 +237,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t) idl_global->err ()->lookup_error (nl_n); return 0; } - + AST_Decl::NodeType nt = d->node_type (); if (nt != AST_Decl::NT_except @@ -273,7 +273,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t) t->destroy (); delete t; t = 0; - + return t; } diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index fc20472e2d5..dfba25ff2e8 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -97,19 +97,19 @@ AST_Field::AST_Field (AST_Type *ft, owns_base_type_ (false) { AST_Decl::NodeType fnt = ft->node_type (); - + // In each of these cases, we are responsible for destroying // our ref_type_ member. this->owns_base_type_ = fnt == AST_Decl::NT_array || fnt == AST_Decl::NT_sequence || fnt == AST_Decl::NT_param_holder; - + if (fnt == AST_Decl::NT_param_holder) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (ft); - + if (ph->info ()->type_ == AST_Decl::NT_const) { idl_global->err ()->not_a_type (ft); @@ -130,19 +130,19 @@ AST_Field::AST_Field (AST_Decl::NodeType nt, owns_base_type_ (false) { AST_Decl::NodeType fnt = ft->node_type (); - + // In each of these cases, we are responsible for destroying // our ref_type_ member. this->owns_base_type_ = fnt == AST_Decl::NT_array || fnt == AST_Decl::NT_sequence || fnt == AST_Decl::NT_param_holder; - + if (fnt == AST_Decl::NT_param_holder) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (ft); - + if (ph->info ()->type_ == AST_Decl::NT_const) { idl_global->err ()->not_a_type (ft); diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index d490aa13622..73600426c4b 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -978,8 +978,8 @@ AST_Generator::create_provides (UTL_ScopedName *n, AST_Provides (n, provides_type), 0); - - return retval; + + return retval; } AST_Uses * @@ -993,8 +993,8 @@ AST_Generator::create_uses (UTL_ScopedName *n, uses_type, is_multiple), 0); - - return retval; + + return retval; } AST_Publishes * @@ -1006,8 +1006,8 @@ AST_Generator::create_publishes (UTL_ScopedName *n, AST_Publishes (n, publishes_type), 0); - - return retval; + + return retval; } AST_Emits * @@ -1019,8 +1019,8 @@ AST_Generator::create_emits (UTL_ScopedName *n, AST_Emits (n, emits_type), 0); - - return retval; + + return retval; } AST_Consumes * AST_Generator::create_consumes (UTL_ScopedName *n, @@ -1031,8 +1031,8 @@ AST_Generator::create_consumes (UTL_ScopedName *n, AST_Consumes (n, consumes_type), 0); - - return retval; + + return retval; } AST_Extended_Port * @@ -1045,8 +1045,8 @@ AST_Generator::create_extended_port ( AST_Extended_Port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Mirror_Port * @@ -1059,8 +1059,8 @@ AST_Generator::create_mirror_port ( AST_Mirror_Port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Connector * @@ -1073,8 +1073,8 @@ AST_Generator::create_connector ( AST_Connector (n, base_connector), 0); - - return retval; + + return retval; } AST_Template_Module * @@ -1087,10 +1087,10 @@ AST_Generator::create_template_module ( AST_Template_Module (n, template_params), 0); - + return retval; } - + AST_Template_Module_Inst * AST_Generator::create_template_module_inst ( UTL_ScopedName *n, @@ -1103,10 +1103,10 @@ AST_Generator::create_template_module_inst ( ref, template_args), 0); - + return retval; } - + AST_Template_Module_Ref * AST_Generator::create_template_module_ref ( UTL_ScopedName *n, @@ -1119,10 +1119,10 @@ AST_Generator::create_template_module_ref ( ref, param_refs), 0); - + return retval; } - + AST_Param_Holder * AST_Generator::create_param_holder ( UTL_ScopedName *parameter_name, @@ -1133,7 +1133,7 @@ AST_Generator::create_param_holder ( AST_Param_Holder (parameter_name, info), 0); - + return retval; } diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp index 986bef94d3a..c419c308324 100644 --- a/TAO/TAO_IDL/ast/ast_home.cpp +++ b/TAO/TAO_IDL/ast/ast_home.cpp @@ -45,7 +45,7 @@ AST_Home::AST_Home (UTL_ScopedName *n, { AST_ValueType *pk = AST_ValueType::narrow_from_decl (primary_key); - + if (pk != 0) { idl_global->primary_keys ().enqueue_tail (pk); @@ -106,12 +106,12 @@ AST_Home::look_in_supported (UTL_ScopedName *e, { continue; } - + AST_Interface *i = AST_Interface::narrow_from_decl (*is); - + d = (i)->lookup_by_name_r (e, full_def_only); - + if (d != 0) { break; @@ -126,12 +126,12 @@ AST_Home::special_lookup (UTL_ScopedName *e, bool full_def_only) { AST_Decl *d = this->look_in_inherited (e, full_def_only); - + if (d == 0) { d = this->look_in_supported (e, full_def_only); } - + return d; } @@ -192,17 +192,17 @@ AST_Home::destroy (void) delete [] this->inherits (); delete [] this->inherits_flat (); - + delete [] this->pd_decls; this->pd_decls = 0; this->pd_decls_allocated = 0; this->pd_decls_used = 0; - + delete [] this->pd_referenced; this->pd_referenced = 0; this->pd_referenced_allocated = 0; this->pd_referenced_used = 0; - + // These are stored by copying the Identifier. for (long i = 0; i < this->pd_name_referenced_used; ++i) { @@ -210,12 +210,12 @@ AST_Home::destroy (void) delete this->pd_name_referenced[i]; this->pd_name_referenced[i] = 0; } - + delete [] this->pd_name_referenced; this->pd_name_referenced = 0; this->pd_name_referenced_allocated = 0; this->pd_name_referenced_used = 0; - + // Skip AST_Interface, since the home's decls // are added to the equivalent interface, and // they should get destroyed there. diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index f3a2ed21268..0f1441d48dd 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -130,14 +130,14 @@ AST_Interface::AST_Interface (UTL_ScopedName *n, { this->size_type (AST_Type::VARIABLE); // always the case this->has_constructor (true); // always the case - + // Enqueue the param holders (if any) for later destruction. // By the time our destroy() is called, it will be too late // to iterate over pd_inherits. for (long i = 0; i < nih; ++i) { if (ih[i]->node_type () == AST_Decl::NT_param_holder) - { + { this->param_holders_.enqueue_tail (ih[i]); } } @@ -350,7 +350,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, // lookup is all that's needed. AST_Decl *d = s->lookup_by_name_local (i->local_name (), false); - + AST_Interface *fd = 0; if (d != 0) @@ -379,7 +379,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, if (fd == 0) { AST_Decl::NodeType nt = d->node_type (); - + if (nt == AST_Decl::NT_struct_fwd || nt == AST_Decl::NT_union_fwd) { idl_global->err ()->redef_error (i->full_name (), @@ -418,14 +418,14 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, } fd->redefine (i); - + AST_InterfaceFwd *fwd = fd->fwd_decl (); - + if (fwd != 0) { fwd->set_as_defined (); } - + // Use full definition node. i->destroy (); delete i; @@ -445,12 +445,12 @@ AST_Interface::redef_clash_populate_r (AST_Type *t) AST_Decl::NodeType nt = t->node_type (); long n = 0; - + if (nt != AST_Decl::NT_param_holder) { AST_Interface *i = AST_Interface::narrow_from_decl (t); - + AST_Type **parents = i->inherits (); long n_parents = i->n_inherits (); @@ -514,7 +514,7 @@ AST_Interface::insert_non_dup (AST_Type *t, { AST_Interface *f = AST_Interface::narrow_from_decl (t); - + // Now check if the dequeued element has any ancestors. If yes, insert // them inside the queue making sure that there are no duplicates. // If we are doing a component, the inheritance list is actually a @@ -523,7 +523,7 @@ AST_Interface::insert_non_dup (AST_Type *t, { for (long i = 0; i < f->n_inherits (); ++i) { - // Retrieve the next parent from which + // Retrieve the next parent from which // the dequeued element inherits. AST_Type *parent = f->inherits ()[i]; @@ -754,7 +754,7 @@ AST_Interface::redef_clash (void) { group2_member_item = group2_member_items.item (); - + AST_Decl::NodeType nt2 = group2_member_item->node_type (); @@ -776,7 +776,7 @@ AST_Interface::redef_clash (void) *group1_member, *group2_member, group2_member_item); - + return true; } else if (pid1->case_compare_quiet (pid2)) @@ -788,7 +788,7 @@ AST_Interface::redef_clash (void) *group1_member, group1_member_item, group2_member_item); - + return true; } else @@ -835,14 +835,14 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e, nis > 0; nis--, is++) { - AST_Interface *i = + AST_Interface *i = AST_Interface::narrow_from_decl (*is); - + if (i == 0) { continue; } - + d = (i)->lookup_by_name_r (e, full_def_only); if (d != 0) { @@ -903,22 +903,22 @@ AST_Interface::look_in_inherited_local (Identifier *e, nis > 0; nis--, is++) { - AST_Interface *i = + AST_Interface *i = AST_Interface::narrow_from_decl (*is); - + if (i == 0) { continue; } - + d = i->lookup_by_name_local (e, full_def_only); - + if (d != 0) { break; } } - + return d; } @@ -1007,7 +1007,7 @@ AST_Interface::analyze_parentage (void) } this->has_mixed_parentage_ = 0; - + // Only interfaces may have mixed parentage. if (this->node_type () != AST_Decl::NT_interface) { @@ -1035,21 +1035,21 @@ AST_Interface::analyze_parentage (void) // Must check if we are declared in a template module, in // which case no code will be generated, so we should not - // be enqueued. + // be enqueued. bool in_tmpl_module = false; UTL_Scope *s = this->defined_in (); - + while (s != 0) { AST_Template_Module *m = AST_Template_Module::narrow_from_scope (s); - + if (m != 0) { in_tmpl_module = true; break; } - + s = ScopeAsDecl (s)->defined_in (); } @@ -1074,18 +1074,18 @@ AST_Interface::special_lookup (UTL_ScopedName *e, { AST_Decl *d = this->look_in_inherited_local (e->head (), full_def_only); - + if (d != 0) { UTL_Scope *s = DeclAsScope (d); UTL_ScopedName *sn = static_cast<UTL_ScopedName *> (e->tail ()); - + return (s != 0 && sn != 0 ? s->lookup_by_name_r (sn, full_def_only) : d); } - + return 0; } @@ -1128,12 +1128,12 @@ AST_Interface::destroy (void) delete t; t = 0; } - + // The destroy() we are in gets called twice if we start from // be_valuetype or be_eventtype. This line keeps us from - // iterating over null pointers the 2nd time. + // iterating over null pointers the 2nd time. this->param_holders_.reset (); - + delete [] this->pd_inherits; this->pd_inherits = 0; this->pd_n_inherits = 0; diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 7c03eaacb54..628cea5ab79 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -364,7 +364,7 @@ AST_Module::fe_add_module (AST_Module *t) // Already defined and cannot be redefined? Or already used? AST_Module *m = 0; AST_Decl *d = this->lookup_for_add (t); - + if (d) { if (!FE_Utils::can_be_redefined (d, t)) diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp index 818aa3f2241..037629214bd 100644 --- a/TAO/TAO_IDL/ast/ast_operation.cpp +++ b/TAO/TAO_IDL/ast/ast_operation.cpp @@ -203,7 +203,7 @@ AST_Operation::destroy (void) this->pd_exceptions->destroy (); this->pd_exceptions = 0; } - + this->UTL_Scope::destroy (); this->AST_Decl::destroy (); } @@ -301,7 +301,7 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t) { return 0; } - + UTL_ScopedName *nl_n = 0; AST_Type *fe = 0; AST_Decl *d = 0; @@ -318,9 +318,9 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t) idl_global->err ()->lookup_error (nl_n); return 0; } - + AST_Decl::NodeType nt = d->node_type (); - + switch (nt) { case AST_Decl::NT_except: @@ -329,32 +329,32 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (d); - + nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_except && nt != AST_Decl::NT_type) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); } - + break; } case AST_Decl::NT_typedef: { AST_Typedef *td = AST_Typedef::narrow_from_decl (d); - + nt = td->primitive_base_type ()->node_type (); - + if (nt != AST_Decl::NT_except) { idl_global->err ()->error1 ( UTL_Error::EIDL_ILLEGAL_RAISES, this); } - + break; } case AST_Decl::NT_native: @@ -363,27 +363,27 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t) int compare = ACE_OS::strcmp (d->local_name ()->get_string (), "UserExceptionBase"); - + if (compare != 0) { idl_global->err ()->error1 ( UTL_Error::EIDL_ILLEGAL_RAISES, this); } - + break; } default: idl_global->err ()->error1 ( UTL_Error::EIDL_ILLEGAL_RAISES, this); - + break; }; bool oneway_op = (this->flags () == AST_Operation::OP_oneway); - + fe = AST_Type::narrow_from_decl (d); if (oneway_op && fe != 0) diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp index 034f1f75be5..9a0d524a31d 100644 --- a/TAO/TAO_IDL/ast/ast_root.cpp +++ b/TAO/TAO_IDL/ast/ast_root.cpp @@ -181,7 +181,7 @@ AST_Root::destroy (void) // processing multiple IDL files. // Final cleanup will be done in fini(). long end = this->pd_decls_used; - + for (i = 2; i < end; ++i) { d = this->pd_decls[i]; @@ -191,7 +191,7 @@ AST_Root::destroy (void) d = 0; --this->pd_decls_used; } - + // Same goes for the references and the name // references, leave the first 2. @@ -202,7 +202,7 @@ AST_Root::destroy (void) { this->pd_referenced[i] = 0; } - + this->pd_referenced_used = 2; for (i = 2; i < this->pd_name_referenced_used; ++i) @@ -212,7 +212,7 @@ AST_Root::destroy (void) delete id; id = 0; } - + this->pd_name_referenced_used = 2; } diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index 1827823d37a..b908a542c39 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -108,12 +108,12 @@ AST_Sequence::AST_Sequence (AST_Expression *ms, owns_base_type_ (false) { AST_Decl::NodeType bnt = bt->node_type (); - + if (bnt == AST_Decl::NT_param_holder) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (bt); - + if (ph->info ()->type_ == AST_Decl::NT_const) { idl_global->err ()->not_a_type (bt); diff --git a/TAO/TAO_IDL/ast/ast_template_module.cpp b/TAO/TAO_IDL/ast/ast_template_module.cpp index 6b6d3dfbba4..e362f620737 100644 --- a/TAO/TAO_IDL/ast/ast_template_module.cpp +++ b/TAO/TAO_IDL/ast/ast_template_module.cpp @@ -50,9 +50,9 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args) this); return false; } - + size_t slot = 0UL; - + for (FE_Utils::T_ARGLIST::CONST_ITERATOR i (*args); !i.done (); i.advance (), ++slot) @@ -60,41 +60,41 @@ AST_Template_Module::match_arg_names (FE_Utils::T_ARGLIST *args) AST_Decl **item = 0; i.next (item); AST_Decl *d = *item; - + if (d->node_type () == AST_Decl::NT_typedef) { AST_Typedef *td = AST_Typedef::narrow_from_decl (d); - + d = td->primitive_base_type (); } - + FE_Utils::T_Param_Info *param = 0; (void) this->template_params_->get (param, slot); const char *s = 0; - + if (! this->match_one_param (param, d)) { UTL_ScopedName *n = d->name (); - + if (n == 0) { AST_Constant *c = AST_Constant::narrow_from_decl (d); - + s = c->exprtype_to_string (); } else { s = d->full_name (); } - + idl_global->err ()->mismatched_template_param (s); - + return false; } } - + return true; } @@ -104,7 +104,7 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs, { UTL_Scope *s = decl_scope; AST_Template_Module *enclosing = 0; - + while (enclosing == 0 && s != 0) { enclosing = AST_Template_Module::narrow_from_scope (s); @@ -117,20 +117,20 @@ AST_Template_Module::match_param_refs (UTL_StrList *refs, { FE_Utils::T_Param_Info *enclosing_param = enclosing->find_param (i.item ()); - + if (enclosing_param == 0) { // Enclosing param not found return false; } - + if (!this->match_param_by_type (enclosing_param)) { // Referenced param type not matched to enclosiong param. return false; } } - + return true; } @@ -171,35 +171,35 @@ AST_Template_Module::match_one_param (FE_Utils::T_Param_Info *param, { return true; } - + if (d->node_type () == AST_Decl::NT_typedef) { AST_Typedef *td = AST_Typedef::narrow_from_decl (d); d = td->primitive_base_type (); } - + AST_Decl::NodeType other_type = d->node_type (); - + if (other_type == AST_Decl::NT_const) { AST_Constant *c = AST_Constant::narrow_from_decl (d); - + AST_Expression *ex = c->constant_value (); - + AST_Expression::AST_ExprValue *ev = ex->check_and_coerce (param->const_type_, param->enum_const_type_decl_); - + if (ev == 0) { idl_global->err ()->coercion_error (ex, param->const_type_); } - + return (ev != 0); } - + return (param->type_ == other_type); } @@ -213,13 +213,13 @@ AST_Template_Module::find_param (UTL_String *name) { FE_Utils::T_Param_Info *param = 0; i.next (param); - + if (param->name_ == name->get_string ()) { return param; } } - + return 0; } @@ -234,7 +234,7 @@ AST_Template_Module::match_param_by_type ( { FE_Utils::T_Param_Info *my_param = 0; i.next (my_param); - + if (param->type_ == my_param->type_) { if (param->type_ == AST_Decl::NT_const) @@ -261,10 +261,10 @@ AST_Template_Module::match_param_by_type ( } } } - + idl_global->err ()->mismatched_template_param ( param->name_.c_str ()); - + return false; } diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp index e2c9a671c73..6699aa78107 100644 --- a/TAO/TAO_IDL/ast/ast_type.cpp +++ b/TAO/TAO_IDL/ast/ast_type.cpp @@ -298,14 +298,14 @@ AST_Type::nested_name (const char* local_name, // generations of "::" here and there, which have now been removed. UTL_Scope *s = this->defined_in (); AST_Decl *def_scope = s != 0 ? ScopeAsDecl (s) : 0; - + // TypeCode is a special case for predefined types, since it's // defined in the CORBA module. bool in_root = (def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root) || ((this->node_type () == AST_Decl::NT_pre_defined && ACE_OS::strcmp (this->flat_name (), "CORBA_TypeCode") == 0)); - + ACE_CString fname (this->full_name ()); bool corba_type = fname.find ("CORBA::") == 0; diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp index 7e376d9eaa0..67fdfe5d8b4 100644 --- a/TAO/TAO_IDL/ast/ast_union_branch.cpp +++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp @@ -187,14 +187,14 @@ AST_UnionBranch::add_labels (AST_Union *u) } const bool enum_labels = (u->udisc_type () == AST_Expression::EV_enum); - + for (UTL_LabellistActiveIterator i (this->pd_ll); !i.is_done (); i.next ()) { AST_Expression *ex = i.item ()->label_val (); UTL_ScopedName *n = ex->n (); - + if (n) { u->add_to_name_referenced (n->first_component ()); @@ -208,13 +208,13 @@ AST_UnionBranch::add_labels (AST_Union *u) ex->ev ()->et = AST_Expression::EV_enum; AST_Enum *disc = AST_Enum::narrow_from_decl (u->disc_type ()); AST_EnumVal *dval = disc->lookup_by_value (ex); - + if (dval == 0) { idl_global->err ()->incompatible_disc_error (disc, ex); throw Bailout (); } - + ex->ev ()->u.eval = dval->constant_value ()->ev ()->u.ulval; } } diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp index 832f6cf478c..97d841e7c18 100644 --- a/TAO/TAO_IDL/ast/ast_valuebox.cpp +++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp @@ -15,14 +15,14 @@ AST_ValueBox::AST_ValueBox (UTL_ScopedName *n, AST_Type (AST_Decl::NT_valuebox, n), AST_ConcreteType (AST_Decl::NT_valuebox, n), - pd_boxed_type (boxed_type) + pd_boxed_type (boxed_type) { } AST_ValueBox::~AST_ValueBox (void) { } - + AST_Type * AST_ValueBox::boxed_type (void) const { @@ -32,7 +32,7 @@ AST_ValueBox::boxed_type (void) const void AST_ValueBox::dump (ACE_OSTREAM_TYPE &o) { - + this->dump_i (o, "valuetype "); this->local_name ()->dump (o); diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp index b61076f528e..c726abc52f6 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp @@ -65,9 +65,9 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n, this->param_holders_.enqueue_tail (supports[i]); } } - + if (inherits_concrete != 0) - { + { if (inherits_concrete->node_type () == AST_Decl::NT_param_holder) { this->param_holders_.enqueue_tail (inherits_concrete); @@ -255,12 +255,12 @@ AST_ValueType::look_in_supported (UTL_ScopedName *e, { continue; } - + AST_Interface *i = AST_Interface::narrow_from_decl (*is); - + d = (i)->lookup_by_name_r (e, full_def_only); - + if (d != 0) { if (d_before == 0) @@ -306,12 +306,12 @@ AST_ValueType::special_lookup (UTL_ScopedName *e, bool full_def_only) { AST_Decl *d = this->look_in_inherited (e, full_def_only); - + if (d == 0) { d = this->look_in_supported (e, full_def_only); } - + return d; } @@ -379,7 +379,7 @@ void AST_ValueType::destroy (void) { this->AST_Interface::destroy (); - + delete [] this->pd_supports; this->pd_supports = 0; this->pd_n_supports = 0; diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp index 7bee77ff986..0748bbe6784 100644 --- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp @@ -521,17 +521,17 @@ ast_visitor_reifying::visit_string (AST_String *node) AST_Expression (b, AST_Expression::EV_ulong), -1); - + Identifier id ("string"); UTL_ScopedName sn (&id, 0); - + ACE_NEW_RETURN (this->reified_node_, AST_String (AST_Decl::NT_string, &sn, bound, node->width ()), -1); - + return 0; } diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp index b360b7b505d..a7fdf281008 100644 --- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp @@ -684,7 +684,7 @@ ast_visitor_tmpl_module_inst::visit_module (AST_Module *node) AST_Module *m = AST_Module::narrow_from_scope (idl_global->scopes ().top ()); - + m->fe_add_module (added_module); idl_global->scopes ().push (added_module); @@ -733,14 +733,14 @@ ast_visitor_tmpl_module_inst::visit_template_module_inst ( AST_Module *instance = idl_global->gen ()->create_module (idl_global->scopes ().top (), node->name ()); - + instance->from_inst (node); // Add the new module to the scope containing the template // module instantiation. AST_Module *m = AST_Module::narrow_from_scope (idl_global->scopes ().top ()); - + m->fe_add_module (instance); // Update our scope management. @@ -900,7 +900,7 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node) node->is_local (), node->is_abstract (), true); - + AST_Interface *added_iface = idl_global->gen ()->create_interface (header.name (), header.inherits (), @@ -918,7 +918,7 @@ ast_visitor_tmpl_module_inst::visit_interface (AST_Interface *node) } idl_global->scopes ().top ()->add_to_scope (added_iface); - + // If this interface has both abstract and concrete parents, // extra code needs to be generated for it, such as overrides // of _is_nil() and release(). @@ -1162,7 +1162,7 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node) UTL_ScopedName sn (&id, 0); AST_Factory *added_factory = 0; - + if (this->for_finder_) { added_factory = @@ -1198,7 +1198,7 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node) // In case it was set for this call. this->for_finder_ = false; - + return 0; } diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp index 172f4d6fcc3..4501c1debf0 100644 --- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_ref.cpp @@ -38,7 +38,7 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref ( // processes the implied IDL. It's a bit inefficient to have // the implied IDL in both the template module and its // instantiations, but otherwise the lookup issues are - // extremely complicated. This approach allows + // extremely complicated. This approach allows // lookup_by_name_local() to just skip over the alias and // match the module of the same name occurring later in the // template module scope. From that vantage point, the @@ -47,15 +47,15 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref ( // module scope (see ast_visitor_reifying::check_and_store() // and ast_visitor_reifying::template_module_rel_name()). UTL_ScopedName sn (node->local_name (), 0); - + AST_Module *added_module = idl_global->gen ()->create_module (idl_global->scopes (). top (), &sn); - + idl_global->scopes ().top ()->add_to_scope (added_module); - + idl_global->scopes ().push (added_module); - + // Visit the scope of referenced template module. No need to // update the template parameter list since its param list has // to be a subset of the one we're in. @@ -67,9 +67,9 @@ ast_visitor_tmpl_module_ref::visit_template_module_ref ( ACE_TEXT ("visit_scope failed\n")), -1); } - + idl_global->scopes ().pop (); - + return 0; } diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 02c1c368c97..0ee1bec8075 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -292,7 +292,7 @@ TAO_CodeGen::start_client_header (const char *fname) *this->client_header_ << "\n#include <string>" << "\n#include <vector>\n"; } - + this->gen_stub_hdr_includes (); size_t const nfiles = idl_global->n_included_idl_files (); @@ -350,7 +350,7 @@ TAO_CodeGen::start_client_header (const char *fname) } } } - + for (ACE_Unbounded_Queue<char *>::CONST_ITERATOR i ( idl_global->ciao_ami_idl_fnames ()); !i.done (); @@ -358,7 +358,7 @@ TAO_CodeGen::start_client_header (const char *fname) { char **tmp = 0; i.next (tmp); - + // Make a String out of it. UTL_String idl_name_str (*tmp); @@ -964,7 +964,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) if (got_tao_pidl) { const char *stub_incl_dir = be_global->stub_include_dir (); - + if (stub_incl_dir == 0) { tao_prefix = "tao/"; @@ -975,7 +975,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) tao_prefix += '/'; } } - + // Generate the include statement for the client header. We just // need to put only the base names. Path info is not required. if (be_global->safe_include ()) @@ -1054,7 +1054,7 @@ TAO_CodeGen::start_anyop_header (const char *fname) } } } - + *this->anyop_header_ << "\n"; // Begin versioned namespace support after initial headers have been @@ -1868,7 +1868,7 @@ TAO_CodeGen::end_server_header (void) /// Otherwise just generate the post_include(), if any, /// and the #endif. if (be_global->gen_skel_files ()) - { + { // End versioned namespace support. Do not place include directives // before this. *os << be_global->versioning_end (); @@ -1904,7 +1904,7 @@ TAO_CodeGen::end_server_header (void) *os << be_nl << be_nl << "#endif /* ifndef */\n" << "\n"; - + return 0; } @@ -2900,7 +2900,7 @@ TAO_CodeGen::gen_stub_src_includes (void) { this->gen_standard_include (this->client_stubs_, "tao/Vector_CDR_T.h"); - + if (be_global->any_support ()) { this->gen_standard_include ( @@ -2908,7 +2908,7 @@ TAO_CodeGen::gen_stub_src_includes (void) "tao/AnyTypeCode/Vector_AnyOp_T.h"); } } - + // Includes whatever arg helper template classes that may be needed. this->gen_stub_arg_file_includes (this->client_stubs_); @@ -3557,16 +3557,16 @@ TAO_CodeGen::gen_exec_idl_includes (void) "ccm/CCM_Object.idl"); if (!be_global->gen_lwccm ()) - { + { this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_Enumeration.idl"); } - + this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_CCMException.idl"); - + this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_HomeExecutorBase.idl"); @@ -3578,7 +3578,7 @@ TAO_CodeGen::gen_exec_idl_includes (void) this->gen_standard_include ( this->ciao_exec_idl_, "ccm/CCM_SessionComponent.idl"); - + if (be_global->ami4ccm_call_back ()) { this->gen_standard_include ( @@ -3598,11 +3598,11 @@ TAO_CodeGen::gen_exec_idl_includes (void) riter.advance ()) { riter.next (path_tmp); - + const char *exec_idl_fname = be_global->be_get_ciao_exec_idl_fname (true); - - /// No need to have the exec IDL file include itself. + + /// No need to have the exec IDL file include itself. if (ACE_OS::strcmp (*path_tmp, exec_idl_fname) != 0) { this->gen_standard_include (this->ciao_exec_idl_, @@ -3686,7 +3686,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) iiter.advance ()) { iiter.next (path_tmp); - + this->gen_standard_include ( this->ciao_conn_header_, *path_tmp); @@ -3698,7 +3698,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) this->ciao_conn_header_, "tao/LocalObject.h"); } - + for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j) { if (j == 0) @@ -3708,7 +3708,7 @@ TAO_CodeGen::gen_conn_hdr_includes (void) char * const idl_name = idl_global->included_idl_files ()[j]; - + bool system_file = ACE_OS::strcmp (idl_name, "Components.idl") == 0 || ACE_OS::strcmp ( @@ -3725,10 +3725,10 @@ TAO_CodeGen::gen_conn_hdr_includes (void) this->gen_standard_include ( this->ciao_conn_header_, BE_GlobalData::be_get_server_hdr (&str, true)); - + str.destroy (); } - + this->gen_standard_include ( this->ciao_conn_header_, BE_GlobalData::be_get_ciao_exec_stub_header ( diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index b4e1a8171f5..9d2cd33ab31 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -201,27 +201,27 @@ be_component::scan (UTL_Scope *s) case AST_Decl::NT_provides: ++this->n_provides_; p = AST_Provides::narrow_from_decl (d); - + if (!p->provides_type ()->is_local ()) { ++this->n_remote_provides_; } - + continue; case AST_Decl::NT_uses: ++this->n_uses_; u = AST_Uses::narrow_from_decl (d); - + if (u->is_multiple ()) { this->has_uses_multiple_ = true; } - + if (!u->uses_type ()->is_local ()) { ++this->n_remote_uses_; } - + continue; case AST_Decl::NT_publishes: ++this->n_publishes_; @@ -242,24 +242,24 @@ be_component::scan (UTL_Scope *s) continue; case AST_Decl::NT_attr: a = AST_Attribute::narrow_from_decl (d);; - + if (!a->readonly ()) { my_nt = this->node_type (); scope_nt = ScopeAsDecl (a->defined_in ())->node_type (); - + /// Attributes coming from a porttype appear - /// only on connectors. + /// only on connectors. if (my_nt == AST_Decl::NT_component && scope_nt == AST_Decl::NT_porttype) { continue; } - + this->has_rw_attributes_ = true; } - + continue; default: continue; @@ -297,7 +297,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os) if (nsupports > 0) { *os << be_idt; - + AST_Type **supp_list = this->supports (); for (long i = 0; i < nsupports; ++i) @@ -309,7 +309,7 @@ be_component::gen_stub_inheritance (TAO_OutStream *os) *os << be_uidt; } - + *os << be_uidt; } @@ -364,7 +364,7 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) << "value," << be_nl << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl << ") == 0" << be_uidt << be_uidt_nl; - + return 0; } @@ -399,31 +399,31 @@ be_component::mirror_scan (AST_PortType *pt) case AST_Decl::NT_provides: ++this->n_uses_; p = AST_Provides::narrow_from_decl (d); - + if (!p->provides_type ()->is_local ()) { ++this->n_remote_uses_; } - + continue; case AST_Decl::NT_uses: ++this->n_provides_; u = AST_Uses::narrow_from_decl (d); - + if (!u->uses_type ()->is_local ()) { ++this->n_remote_provides_; } - + continue; case AST_Decl::NT_attr: a = AST_Attribute::narrow_from_decl (d);; - + if (!a->readonly ()) { this->has_rw_attributes_ = true; } - + continue; default: continue; diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp index eed6949227c..fd7742e25a4 100644 --- a/TAO/TAO_IDL/be/be_connector.cpp +++ b/TAO/TAO_IDL/be/be_connector.cpp @@ -93,11 +93,11 @@ be_connector::check_ancestors (void) /// (2010-05-05) putting derived DDS4CCM connector declarations /// in application IDL. AST_Connector *base = this; - + while (base != 0) { const char *base_fname = base->full_name (); - + if (ACE_OS::strcmp (base_fname, "CCM_DDS::DDS_TopicBase") == 0) { this->dds_connector_ = true; @@ -110,7 +110,7 @@ be_connector::check_ancestors (void) idl_global->ami_connector_seen_ = true; break; } - + base = base->base_connector (); } } diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp index 1bc36f1f7a1..8e1acae31ac 100644 --- a/TAO/TAO_IDL/be/be_enum.cpp +++ b/TAO/TAO_IDL/be/be_enum.cpp @@ -57,16 +57,16 @@ be_enum::gen_ostream_operator (TAO_OutStream *os, << "{" << be_idt_nl << "switch (_tao_enumerator)" << be_idt_nl << "{" << be_idt_nl; - + for (int i = 0; i < this->member_count (); ++i) { UTL_ScopedName *mname = this->value_to_name (static_cast<unsigned long> (i)); - + *os << "case " << mname << ": return strm << \"" << mname << "\";" << be_nl; } - + *os << "default: return strm;" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}" << be_nl; diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp index 5d3d1679097..e8bc0c3f6ec 100644 --- a/TAO/TAO_IDL/be/be_factory.cpp +++ b/TAO/TAO_IDL/be/be_factory.cpp @@ -48,7 +48,7 @@ be_factory::destroy (void) // Call the destroy methods of our base classes. this->be_scope::destroy (); this->be_decl::destroy (); - + this->AST_Factory::destroy (); } diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp index 199e6cfbb47..bbe80f14e73 100644 --- a/TAO/TAO_IDL/be/be_field.cpp +++ b/TAO/TAO_IDL/be/be_field.cpp @@ -37,7 +37,7 @@ be_field::be_field (AST_Type *ft, // This covers valuetype fields as well, which is what we want. AST_Decl::NodeType nt = ft->unaliased_type ()->node_type (); - + if (nt == AST_Decl::NT_string || nt == AST_Decl::NT_wstring) { idl_global->string_member_seen_ = true; diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index d6ad8bc02f0..aca95d1012e 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -217,11 +217,11 @@ be_generator::create_interface (UTL_ScopedName *n, l, a), 0); - + /// Trigger this interation over the included pragmas when the /// first local interface is seen in the main file. In an /// executor IDL file (the case we want), this happens near the - /// top. In other files, it will do no harm. + /// top. In other files, it will do no harm. if (l && idl_global->in_main_file ()) { FE_Utils::create_implied_ami_uses_stuff (); @@ -982,8 +982,8 @@ be_generator::create_provides (UTL_ScopedName *n, be_provides (n, provides_type), 0); - - return retval; + + return retval; } AST_Uses * @@ -997,8 +997,8 @@ be_generator::create_uses (UTL_ScopedName *n, uses_type, is_multiple), 0); - - return retval; + + return retval; } AST_Publishes * @@ -1010,8 +1010,8 @@ be_generator::create_publishes (UTL_ScopedName *n, be_publishes (n, publishes_type), 0); - - return retval; + + return retval; } AST_Emits * @@ -1023,8 +1023,8 @@ be_generator::create_emits (UTL_ScopedName *n, be_emits (n, emits_type), 0); - - return retval; + + return retval; } AST_Consumes * be_generator::create_consumes (UTL_ScopedName *n, @@ -1035,8 +1035,8 @@ be_generator::create_consumes (UTL_ScopedName *n, be_consumes (n, consumes_type), 0); - - return retval; + + return retval; } AST_Extended_Port * @@ -1049,8 +1049,8 @@ be_generator::create_extended_port ( be_extended_port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Mirror_Port * @@ -1063,8 +1063,8 @@ be_generator::create_mirror_port ( be_mirror_port (n, porttype_ref), 0); - - return retval; + + return retval; } AST_Connector * @@ -1077,7 +1077,7 @@ be_generator::create_connector ( be_connector (n, base_connector), 0); - + return retval; } @@ -1091,10 +1091,10 @@ be_generator::create_template_module ( be_template_module (n, template_params), 0); - + return retval; } - + AST_Template_Module_Inst * be_generator::create_template_module_inst ( UTL_ScopedName *n, @@ -1107,10 +1107,10 @@ be_generator::create_template_module_inst ( ref, template_args), 0); - + return retval; } - + AST_Template_Module_Ref * be_generator::create_template_module_ref ( UTL_ScopedName *n, @@ -1123,10 +1123,10 @@ be_generator::create_template_module_ref ( ref, param_refs), 0); - + return retval; } - + AST_Param_Holder * be_generator::create_param_holder ( UTL_ScopedName *parameter_name, @@ -1137,7 +1137,7 @@ be_generator::create_param_holder ( be_param_holder (parameter_name, info), 0); - + return retval; } diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 3b72e95f6c7..25f4a8e236e 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -275,7 +275,7 @@ BE_GlobalData::be_get_client_hdr (UTL_String *idl_file_name, ACE_CString fn (idl_file_name->get_string ()); ACE_CString fn_ext = fn.substr (fn.length () - 5); bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); - + if (!orb_file && !be_global->gen_custom_ending () && FE_Utils::validate_orb_include (idl_file_name)) { @@ -313,7 +313,7 @@ BE_GlobalData::be_get_server_hdr (UTL_String *idl_file_name, ACE_CString fn (idl_file_name->get_string ()); ACE_CString fn_ext = fn.substr (fn.length () - 5); bool orb_file = (fn_ext == ".pidl" || fn_ext == ".PIDL"); - + if (!orb_file && !be_global->gen_custom_ending () && FE_Utils::validate_orb_include (idl_file_name)) { @@ -1983,7 +1983,7 @@ BE_GlobalData:: void_type (void) AST_Decl *d = idl_global->root ()->lookup_primitive_type ( AST_Expression::EV_void); - + this->void_type_ = AST_PredefinedType::narrow_from_decl (d); } @@ -2839,7 +2839,7 @@ BE_GlobalData::parse_args (long &i, char **av) else if (av[i][2] == 'M') { // AMI4CCM calls implicit option 'C': AMI with Call back. - be_global->ami_call_back (true); + be_global->ami_call_back (true); // Generate tie classes and files be_global->ami4ccm_call_back (true); } diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp index 22e14bf6221..5b7ac575488 100644 --- a/TAO/TAO_IDL/be/be_helper.cpp +++ b/TAO/TAO_IDL/be/be_helper.cpp @@ -82,7 +82,7 @@ TAO_OutStream::TAO_OutStream (void) { this->tab_unit_str_ += ' '; } - + this->tab_unit_ = this->tab_unit_str_.c_str (); } @@ -486,14 +486,14 @@ TAO_OutStream& TAO_OutStream::print (AST_Expression *expr) { AST_Expression::AST_ExprValue *ev = expr->ev (); - + /// Never happens as far as I know, but just in case... if (ev == 0) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO_OutStream::print() - ") ACE_TEXT ("expression not evaluated\n"))); - + return *this; } diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp index 77e294b4ffd..cecee18c8cb 100644 --- a/TAO/TAO_IDL/be/be_home.cpp +++ b/TAO/TAO_IDL/be/be_home.cpp @@ -102,7 +102,7 @@ be_home::scan (UTL_Scope *s) AST_Decl *d = i.item (); AST_Attribute *attr = AST_Attribute::narrow_from_decl (d); - + if (attr != 0 && ! attr->readonly ()) { this->has_rw_attributes_ = true; @@ -123,67 +123,67 @@ be_home::destroy (void) { delete [] this->full_skel_name_; this->full_skel_name_ = 0; - + delete [] this->full_coll_name_; this->full_coll_name_ = 0; - + delete [] this->local_coll_name_; this->local_coll_name_ = 0; - + delete [] this->relative_skel_name_; this->relative_skel_name_ = 0; - + delete [] this->base_proxy_impl_name_; this->base_proxy_impl_name_ = 0; - + delete [] this->remote_proxy_impl_name_; this->remote_proxy_impl_name_ = 0; - + delete [] this->direct_proxy_impl_name_; this->direct_proxy_impl_name_ = 0; - + delete [] this->full_base_proxy_impl_name_; this->full_base_proxy_impl_name_ = 0; - + delete [] this->full_remote_proxy_impl_name_; this->full_remote_proxy_impl_name_ = 0; - + delete [] this->full_direct_proxy_impl_name_; this->full_direct_proxy_impl_name_ = 0; - + delete [] this->base_proxy_broker_; this->base_proxy_broker_ = 0; - + delete [] this->remote_proxy_broker_; this->remote_proxy_broker_ = 0; - + delete [] this->strategized_proxy_broker_; this->strategized_proxy_broker_ = 0; - + delete [] this->full_base_proxy_broker_name_; this->full_base_proxy_broker_name_ = 0; - + delete [] this->full_remote_proxy_broker_name_; this->full_remote_proxy_broker_name_ = 0; - + delete [] this->full_strategized_proxy_broker_name_; this->full_strategized_proxy_broker_name_ = 0; - + delete [] this->client_scope_; this->client_scope_ = 0; - + delete [] this->flat_client_scope_; this->flat_client_scope_ = 0; - + delete [] this->server_scope_; this->server_scope_ = 0; - + delete [] this->flat_server_scope_; this->flat_server_scope_ = 0; - + this->be_scope::destroy (); this->be_type::destroy (); - + // This skips AST_Interface, for the reason above. this->AST_Home::destroy (); } diff --git a/TAO/TAO_IDL/be/be_identifier_helper.cpp b/TAO/TAO_IDL/be/be_identifier_helper.cpp index af6ab6bfb32..87d6210514b 100644 --- a/TAO/TAO_IDL/be/be_identifier_helper.cpp +++ b/TAO/TAO_IDL/be/be_identifier_helper.cpp @@ -78,7 +78,7 @@ IdentifierHelper::original_local_name (Identifier * local_name) { Identifier * id = 0; const char *lname = local_name->get_string (); - + // Remove _cxx_ if: // 1. it occurs and // 2. it occurs at the beginning of the string and @@ -86,10 +86,10 @@ IdentifierHelper::original_local_name (Identifier * local_name) if (ACE_OS::strstr (lname, "_cxx_") == lname) { TAO_IDL_CPP_Keyword_Table cpp_key_tbl; - + unsigned int len = static_cast<unsigned int> (ACE_OS::strlen (lname + 5)); - + const TAO_IDL_CPP_Keyword_Entry *entry = cpp_key_tbl.lookup (lname + 5, len); @@ -101,12 +101,12 @@ IdentifierHelper::original_local_name (Identifier * local_name) 0); } } - + if (id == 0) { id = local_name->copy (); } - + return id; } @@ -133,9 +133,9 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) for_idl ? IdentifierHelper::original_local_name (i.item ()) : i.item ()->copy (); - + i.next (); - + // Append the identifier. retval += for_idl @@ -154,12 +154,12 @@ IdentifierHelper::orig_sn (UTL_IdList * sn, bool for_idl) second = true; } } - + id->destroy (); delete id; id = 0; } - + return retval; } @@ -175,7 +175,7 @@ IdentifierHelper::is_idl_keyword (Identifier * local_name) return !idl_global->idl_keywords ().find (ext_id); } -ACE_CString +ACE_CString IdentifierHelper::try_escape (Identifier * local_name) { ACE_CString s_local_name (local_name->get_string ()); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index bf414c03ce7..6a49393a389 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -216,7 +216,7 @@ be_interface::compute_full_skel_name (const char *prefix, { return; } - + size_t namelen = ACE_OS::strlen (prefix); long first = true; long second = false; @@ -787,24 +787,24 @@ be_interface:: gen_var_out_seq_decls (void) // Generate the ifdefined macro for this interface. os->gen_ifdef_macro (this->flat_name (), "var_out"); - + // Need this clunky string compare for when we are processing // the *A.idl file. The *_sendc operations are generated in // a separate interface distinguished only by the AMI4CCM_ // prefix. Since it does not come from implied IDL (in this // execution of the IDL compiler) there is nothing // to tell the IDL compiler that this interface is in any - // way special. All we can do is search for the prefix. + // way special. All we can do is search for the prefix. ACE_CString test (lname, 0, false); bool has_ami4ccm_prefix = (test.find ("AMI4CCM_") == 0); - + bool already_ami = (this->is_ami_rh () || this->is_ami4ccm_rh () || has_ami4ccm_prefix); - + /// Forward declare the handler interface before declaring - /// the original interface. + /// the original interface. if (be_global->ami_call_back () && !already_ami) { @@ -1210,7 +1210,7 @@ be_interface::gen_operation_table (const char *flat_name, *os << "_repository_id,&" << skeleton_class_name << "::_repository_id_skel, 0" << be_nl; - + ++this->skel_count_; } @@ -1303,12 +1303,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface, { be_operation *op = be_operation::narrow_from_decl (d); - + if (op->is_sendc_ami ()) { continue; } - + // We are an operation node. *os << "{\"" << d->original_local_name () << "\", &" << full_skeleton_name << "::" @@ -1404,12 +1404,12 @@ be_interface::gen_optable_entries (be_interface *derived_interface, { be_operation *op = be_operation::narrow_from_decl (d); - + if (op->is_sendc_ami ()) { continue; } - + // Generate operation name. // We are an operation node. We use the original @@ -1869,7 +1869,7 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) "fclose"), -1); } - + // And reset file to 0 because otherwise there is a problem during destruction of stream. tao_cg->gperf_input_stream ()->file () = 0; @@ -2212,13 +2212,13 @@ be_interface::gen_skel_helper (be_interface *derived, { be_operation *op = be_operation::narrow_from_decl (d); - - /// These are not generated on the server side. + + /// These are not generated on the server side. if (op->is_sendc_ami ()) { continue; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ @@ -2273,7 +2273,7 @@ be_interface::gen_skel_helper (be_interface *derived, { return -1; } - + *os << be_nl << be_nl; if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) @@ -2481,7 +2481,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived, if (nt == AST_Decl::NT_op) { op = be_operation::narrow_from_decl (d); - + /// Skip these on the skeleton side. if (op->is_sendc_ami ()) { @@ -2697,64 +2697,64 @@ be_interface::destroy (void) { delete [] this->full_skel_name_; this->full_skel_name_ = 0; - + delete [] this->full_coll_name_; this->full_coll_name_ = 0; - + delete [] this->local_coll_name_; this->local_coll_name_ = 0; - + delete [] this->relative_skel_name_; this->relative_skel_name_ = 0; - + delete [] this->base_proxy_impl_name_; this->base_proxy_impl_name_ = 0; - + delete [] this->remote_proxy_impl_name_; this->remote_proxy_impl_name_ = 0; - + delete [] this->direct_proxy_impl_name_; this->direct_proxy_impl_name_ = 0; - + delete [] this->full_base_proxy_impl_name_; this->full_base_proxy_impl_name_ = 0; - + delete [] this->full_remote_proxy_impl_name_; this->full_remote_proxy_impl_name_ = 0; - + delete [] this->full_direct_proxy_impl_name_; this->full_direct_proxy_impl_name_ = 0; - + delete [] this->base_proxy_broker_; this->base_proxy_broker_ = 0; - + delete [] this->remote_proxy_broker_; this->remote_proxy_broker_ = 0; - + delete [] this->strategized_proxy_broker_; this->strategized_proxy_broker_ = 0; - + delete [] this->full_base_proxy_broker_name_; this->full_base_proxy_broker_name_ = 0; - + delete [] this->full_remote_proxy_broker_name_; this->full_remote_proxy_broker_name_ = 0; - + delete [] this->full_strategized_proxy_broker_name_; this->full_strategized_proxy_broker_name_ = 0; - + delete [] this->client_scope_; this->client_scope_ = 0; - + delete [] this->flat_client_scope_; this->flat_client_scope_ = 0; - + delete [] this->server_scope_; this->server_scope_ = 0; - + delete [] this->flat_server_scope_; this->flat_server_scope_ = 0; - + // Call the destroy methods of our base classes. this->AST_Interface::destroy (); this->be_scope::destroy (); @@ -2932,13 +2932,13 @@ be_interface::gen_stub_inheritance (TAO_OutStream *os) if (nparents > 0) { *os << be_idt; - + AST_Type **parents = this->inherits (); for (i = 0; i < nparents; ++i) { AST_Type *parent = parents[i]; - + if (! parent->is_abstract ()) { has_concrete_parent = true; @@ -3416,7 +3416,7 @@ be_interface::base_proxy_impl_name (void) this->local_name (), this->suffix_table_[PROXY_IMPL]); } - + return this->base_proxy_impl_name_; } @@ -3430,7 +3430,7 @@ be_interface::full_base_proxy_impl_name (void) this->base_proxy_impl_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_base_proxy_impl_name_, char[length + 1], 0); @@ -3440,7 +3440,7 @@ be_interface::full_base_proxy_impl_name (void) ACE_OS::strcat (this->full_base_proxy_impl_name_, base_name); } - + return this->full_base_proxy_impl_name_; } @@ -3456,7 +3456,7 @@ be_interface::remote_proxy_impl_name (void) this->suffix_table_[PROXY_IMPL], this->tag_table_[REMOTE]); } - + return this->remote_proxy_impl_name_; } @@ -3469,7 +3469,7 @@ be_interface::full_remote_proxy_impl_name (void) const char *base_name = this->remote_proxy_impl_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_remote_proxy_impl_name_, char[length + 1], 0); @@ -3479,7 +3479,7 @@ be_interface::full_remote_proxy_impl_name (void) ACE_OS::strcat (this->full_remote_proxy_impl_name_, base_name); } - + return this->full_remote_proxy_impl_name_; } @@ -3495,7 +3495,7 @@ be_interface::direct_proxy_impl_name (void) this->suffix_table_[PROXY_IMPL], this->tag_table_[DIRECT]); } - + return this->direct_proxy_impl_name_; } @@ -3509,7 +3509,7 @@ be_interface::full_direct_proxy_impl_name (void) size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_direct_proxy_impl_name_, char[length + 1], 0); @@ -3519,7 +3519,7 @@ be_interface::full_direct_proxy_impl_name (void) ACE_OS::strcat (this->full_direct_proxy_impl_name_, base_name); } - + return this->full_direct_proxy_impl_name_; } @@ -3535,7 +3535,7 @@ be_interface::base_proxy_broker_name (void) this->local_name (), this->suffix_table_[PROXY_BROKER]); } - + return this->base_proxy_broker_; } @@ -3548,7 +3548,7 @@ be_interface::full_base_proxy_broker_name (void) const char *base_name = this->base_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_base_proxy_broker_name_, char[length + 1], 0); @@ -3558,7 +3558,7 @@ be_interface::full_base_proxy_broker_name (void) ACE_OS::strcat (this->full_base_proxy_broker_name_, base_name); } - + return this->full_base_proxy_broker_name_; } @@ -3575,7 +3575,7 @@ be_interface::remote_proxy_broker_name (void) this->suffix_table_[PROXY_BROKER], this->tag_table_[REMOTE]); } - + return this->remote_proxy_broker_; } @@ -3588,7 +3588,7 @@ be_interface::full_remote_proxy_broker_name (void) const char *base_name = this->remote_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_remote_proxy_broker_name_, char[length + 1], 0); @@ -3598,7 +3598,7 @@ be_interface::full_remote_proxy_broker_name (void) ACE_OS::strcat (this->full_remote_proxy_broker_name_, base_name); } - + return this->full_remote_proxy_broker_name_; } @@ -3615,7 +3615,7 @@ be_interface::strategized_proxy_broker_name (void) this->suffix_table_[PROXY_BROKER], this->tag_table_[STRATEGIZED]); } - + return this->strategized_proxy_broker_; } @@ -3629,7 +3629,7 @@ be_interface::full_strategized_proxy_broker_name (void) this->strategized_proxy_broker_name (); size_t length = ACE_OS::strlen (scope) + ACE_OS::strlen (base_name); - + ACE_NEW_RETURN (this->full_strategized_proxy_broker_name_, char[length + 1], 0); @@ -3639,7 +3639,7 @@ be_interface::full_strategized_proxy_broker_name (void) ACE_OS::strcat (this->full_strategized_proxy_broker_name_, base_name); } - + return this->full_strategized_proxy_broker_name_; } @@ -3660,7 +3660,7 @@ be_interface::client_enclosing_scope (void) ACE_OS::strncpy (this->client_scope_, full_name, length); this->client_scope_[length] = '\0'; } - + return this->client_scope_; } @@ -3675,7 +3675,7 @@ be_interface::flat_client_enclosing_scope (void) size_t offset = ACE_OS::strlen (name); size_t length = ACE_OS::strlen (full_name) - offset; - + ACE_NEW_RETURN (this->flat_client_scope_, char[length + 1], 0); @@ -3685,7 +3685,7 @@ be_interface::flat_client_enclosing_scope (void) length); this->flat_client_scope_[length] = '\0'; } - + return this->flat_client_scope_; } @@ -3709,7 +3709,7 @@ be_interface::server_enclosing_scope (void) ACE_OS::strncpy (this->server_scope_, full_name, length); this->server_scope_[length] = '\0'; } - + return this->server_scope_; } diff --git a/TAO/TAO_IDL/be/be_null_return_emitter.cpp b/TAO/TAO_IDL/be/be_null_return_emitter.cpp index d8b689dbf4e..d0d79ce406f 100644 --- a/TAO/TAO_IDL/be/be_null_return_emitter.cpp +++ b/TAO/TAO_IDL/be/be_null_return_emitter.cpp @@ -37,9 +37,9 @@ int be_null_return_emitter::emit (be_type *node) { os_ << "return "; - + be_visitor_null_return_value visitor (this->ctx_); - + if (node->accept (&visitor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,8 +49,8 @@ be_null_return_emitter::emit (be_type *node) node->full_name ()), -1); } - + os_ << ";"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_param_holder.cpp b/TAO/TAO_IDL/be/be_param_holder.cpp index 2e51be56b44..958a336b779 100644 --- a/TAO/TAO_IDL/be/be_param_holder.cpp +++ b/TAO/TAO_IDL/be/be_param_holder.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Place holder referenced by AST_Field (or subclass) + * Place holder referenced by AST_Field (or subclass) * representing a corresponding template parameter in IDL. * * diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index 425bccc2ee9..e1adf705919 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -209,7 +209,7 @@ BE_produce (void) be_visitor_root_is root_is_visitor (&ctx); BE_visit_root (root_is_visitor, "implementation skeleton"); } - + if (be_global->gen_ciao_svnt ()) { ctx.state (TAO_CodeGen::TAO_ROOT_SVH); @@ -220,7 +220,7 @@ BE_produce (void) be_visitor_root_svs root_svs_visitor (&ctx); BE_visit_root (root_svs_visitor, "CIAO servant source"); } - + if (be_global->gen_ciao_exec_idl ()) { ctx.state (TAO_CodeGen::TAO_ROOT_EX_IDL); @@ -238,7 +238,7 @@ BE_produce (void) be_visitor_root_exs root_exs_visitor (&ctx); BE_visit_root (root_exs_visitor, "CIAO exec impl source"); } - + if (be_global->gen_ciao_conn_impl ()) { ctx.state (TAO_CodeGen::TAO_ROOT_CNH); @@ -249,7 +249,7 @@ BE_produce (void) be_visitor_root_cns root_cns_visitor (&ctx); BE_visit_root (root_cns_visitor, "CIAO conn impl source"); } - + tao_cg->gen_export_files (); // Done with this IDL file. diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp index 3901bc329e1..12679acf696 100644 --- a/TAO/TAO_IDL/be/be_root.cpp +++ b/TAO/TAO_IDL/be/be_root.cpp @@ -42,7 +42,7 @@ void be_root::destroy (void) { // Call the destroy methods of our base classes. - + // The scope of the root is handled specially, since we may // be processing multiple IDL files and we want to keep // the predefined types around until we are all done. diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 3a8323316a5..2fa1daddacd 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -561,7 +561,7 @@ be_sequence::gen_base_class_name (TAO_OutStream *os, { *os << "std::vector<" << elem->nested_type_name (ctx_scope) << ">"; - + return 0; } */ diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp index b16aeb60867..51ad5ab53d3 100644 --- a/TAO/TAO_IDL/be/be_string.cpp +++ b/TAO/TAO_IDL/be/be_string.cpp @@ -58,12 +58,12 @@ be_string::gen_member_ostream_operator (TAO_OutStream *os, if (this->width () == 1) { *os << "\"\\\"\" << "; - + this->be_type::gen_member_ostream_operator (os, instance_name, use_underscore, accessor); - + *os << " << \"\\\"\""; } else @@ -142,7 +142,7 @@ be_string::compute_tc_name (void) ACE_NEW (id, Identifier (local_tc_name.c_str ())); } - + zero.destroy (); UTL_ScopedName *conc_name = 0; diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp index 39141f84456..f6de0494046 100644 --- a/TAO/TAO_IDL/be/be_structure.cpp +++ b/TAO/TAO_IDL/be/be_structure.cpp @@ -98,24 +98,24 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, << "std::ostream& operator<< (" << be_idt << be_idt_nl << "std::ostream &strm," << be_nl << "const " << this->name () << " &"; - + long n = this->pd_decls_used; - - // be_exception is a subclass and could be empty. + + // be_exception is a subclass and could be empty. if (n > 0) - { + { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << "strm << \"" << this->name () << "(\""; - + for (long i = 0; i < n; ++i) { be_field *f = be_field::narrow_from_decl (this->pd_decls[i]); - + // We don't want any decls, just members. if (f == 0) { @@ -125,11 +125,11 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, if (i != 0) { *os << " << \", \""; - } - + } + *os << be_nl << " << "; - + ACE_CString instance_name ("_tao_aggregate."); instance_name += f->local_name ()->get_string (); AST_Decl::NodeType nt = f->field_type ()->node_type (); @@ -140,7 +140,7 @@ be_structure::gen_ostream_operator (TAO_OutStream *os, member_use_underscore, false); } - + *os << be_nl << " << \")\";" << be_nl << be_nl << "return strm;" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp index c71c22bf93a..f8d0d9d2ec0 100644 --- a/TAO/TAO_IDL/be/be_type.cpp +++ b/TAO/TAO_IDL/be/be_type.cpp @@ -295,26 +295,26 @@ be_type::gen_stub_decls (TAO_OutStream *os) { return; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl; - + AST_Interface *i = AST_Interface::narrow_from_decl (this); AST_ValueType *v = AST_ValueType::narrow_from_decl (this); - + if (i != 0) { *os << be_nl << "typedef " << this->local_name () << (v == 0 ? "_ptr" : " *") << " _ptr_type;"; } - + bool skip_varout = false; AST_Sequence *s = AST_Sequence::narrow_from_decl (this); - + if (s != 0) { // _vars and _outs not supported yet by alt mapping. @@ -323,16 +323,16 @@ be_type::gen_stub_decls (TAO_OutStream *os) skip_varout = true; } } - + if (!skip_varout) - { + { *os << be_nl << "typedef " << this->local_name () << "_var _var_type;" << be_nl << "typedef " << this->local_name () << "_out _out_type;"; } - + bool gen_any_destructor = be_global->any_support () && (!this->is_local () diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index 660bdf84aab..4e2171676eb 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -107,20 +107,20 @@ be_union::gen_ostream_operator (TAO_OutStream *os, << "strm << \"" << this->name () << "(\";" << be_nl << be_nl << "switch (_tao_union._d ())" << be_nl << "{" << be_idt; - + for (long i = 0; i < this->pd_decls_used; ++i) { be_union_branch *ub = be_union_branch::narrow_from_decl (this->pd_decls[i]); - + // We don't want any decls, just members. if (ub == 0) { continue; } - + *os << be_nl; - + unsigned long ll_len = ub->label_list_length (); for (unsigned long j = 0; j < ll_len; ++j) @@ -151,27 +151,27 @@ be_union::gen_ostream_operator (TAO_OutStream *os, ACE_CString instance_name ("_tao_union."); instance_name += ub->local_name ()->get_string (); - + *os << "strm << "; - + ub->gen_member_ostream_operator (os, instance_name.c_str (), use_underscore, true); - + *os << ";" << be_nl << "break;" << be_uidt; } - + // Some compilers complain unless this is present, but only - // if not all values are covered in case statements. + // if not all values are covered in case statements. if (this->gen_empty_default_label ()) { *os << be_nl << "default:" << be_idt_nl << "break;" << be_uidt; } - + *os << be_uidt_nl << "}" << be_nl << be_nl << "return strm << \")\";" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index a9df3463559..955e8bb0a20 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -43,7 +43,7 @@ be_util::gen_nested_namespace_begin (TAO_OutStream *os, { // Leave the outermost root scope. *os << be_nl << "namespace "; - + if (first_level && skel) { // We are outermost module. @@ -77,22 +77,22 @@ void be_util::gen_nesting_open (TAO_OutStream &os, AST_Decl *node) { AST_Decl::NodeType nt = node->node_type (); - + if (nt == AST_Decl::NT_root) { os << be_nl; return; } - + be_util::gen_nesting_open ( os, ScopeAsDecl (node->defined_in ())); - + if (nt == AST_Decl::NT_module) - { + { ACE_CString module_name ( IdentifierHelper::try_escape (node->original_local_name ())); - + os << be_nl << "module " << module_name.c_str () << be_nl << "{" << be_idt; @@ -104,12 +104,12 @@ be_util::gen_nesting_close (TAO_OutStream &os, AST_Decl *node) { AST_Decl *d = ScopeAsDecl (node->defined_in ()); AST_Decl::NodeType nt = d->node_type (); - + while (nt != AST_Decl::NT_root) { os << be_uidt_nl << "};"; - + d = ScopeAsDecl (d->defined_in ()); nt = d->node_type (); } diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 7d01635b3f8..1d4f6e0ccb0 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -97,7 +97,7 @@ be_valuetype::be_valuetype (UTL_ScopedName *n, { be_interface *intf = be_interface::narrow_from_decl (this->pd_supports[i]); - + if (intf == 0) { // The item is a template param holder. @@ -363,7 +363,7 @@ be_valuetype::have_supported_op (be_interface * node) long i; // loop index long n_inherits = node->n_inherits (); AST_Type **inherits = node->inherits (); - + for (i = 0; i < n_inherits; ++i) { be_interface * intf = diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index 4e16bdbc91c..6d42245906c 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -187,14 +187,14 @@ be_visitor_amh_pre_proc::create_response_handler ( response_handler->set_imported (node->imported ()); response_handler->set_line (node->line ()); response_handler->set_file_name (node->file_name ()); - + // Set repo id to 0, so it will be recomputed on the next access, // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. response_handler->AST_Decl::repoID (0); response_handler->prefix (const_cast<char*> (node->prefix ())); - + response_handler->gen_fwd_helper_name (); this->add_rh_node_members (node, response_handler, exception_holder); return response_handler; @@ -291,8 +291,8 @@ be_visitor_amh_pre_proc::create_response_handler_operation ( { return -1; } - - /// These are for the stub side only. + + /// These are for the stub side only. if (node->is_sendc_ami ()) { return 0; @@ -324,11 +324,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( this->create_response_handler_operation (get_operation, response_handler, exception_holder); - + get_operation->destroy (); delete get_operation; get_operation = 0; - + if (status == -1) { return -1; @@ -348,11 +348,11 @@ be_visitor_amh_pre_proc::create_response_handler_attribute ( this->create_response_handler_operation (set_operation, response_handler, exception_holder); - + set_operation->destroy (); delete set_operation; set_operation = 0; - + return status; } @@ -372,14 +372,14 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node, 1, 0), -1); - + node_excep->set_name (operation_name); Identifier *arg_id = 0; ACE_NEW_RETURN (arg_id, Identifier ("holder"), -1); - + UTL_ScopedName *arg_name = 0; ACE_NEW_RETURN (arg_name, UTL_ScopedName (arg_id, 0), @@ -451,7 +451,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, ACE_NEW_RETURN (arg_id, Identifier ("return_value"), -1); - + UTL_ScopedName *arg_name = 0; ACE_NEW_RETURN (arg_name, UTL_ScopedName (arg_id, 0), @@ -464,9 +464,9 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node, node->return_type (), arg_name), -1); - + arg->set_name (arg_name); - + // Add the response handler to the argument list operation->be_add_argument (arg); } @@ -575,14 +575,14 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node) excep_holder->set_name (excep_holder_name); excep_holder->set_defined_in (node->defined_in ()); - + // Set repo id to 0, so it will be recomputed on the next access, // and set the prefix to the node's prefix. All this is // necessary in case the node's prefix was modified after // its declaration. excep_holder->AST_Decl::repoID (0); excep_holder->prefix (const_cast<char*> (node->prefix ())); - + excep_holder->gen_fwd_helper_name (); // Now our customized valuetype is created, we have to @@ -704,7 +704,7 @@ be_visitor_amh_pre_proc::create_raise_operation ( { // Copy the exceptions. UTL_ExceptList *exceptions = orig_op->exceptions (); - + if (0 != exceptions) { operation->be_add_exceptions (exceptions->copy ()); diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index 2ed02589fb3..4fb3d1c9636 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -64,7 +64,7 @@ be_visitor_ami_pre_proc::visit_root (be_root *node) /// Generate the *A.idl file containing AMI4CCM-related /// interfaces and connector. int status = this->generate_ami4ccm_idl (); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -204,7 +204,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + be_interface *parent = be_interface::narrow_from_scope (node->defined_in ()); @@ -214,7 +214,7 @@ be_visitor_ami_pre_proc::visit_operation (be_operation *node) be_operation *sendc_op = this->create_sendc_operation (node); // for arguments = TRUE - + parent->be_add_operation (sendc_op); return 0; @@ -236,18 +236,18 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node) delete set_operation; set_operation = 0; } - + /// Temporarily generate the get operation. be_operation *get_operation = this->generate_get_operation (node); get_operation->set_defined_in (node->defined_in ()); this->visit_operation (get_operation); - + get_operation->destroy (); delete get_operation; get_operation = 0; - + return 0; } @@ -270,7 +270,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) UTL_ScopedName *reply_handler_name = static_cast<UTL_ScopedName *> (node->name ()->copy ()); - + reply_handler_name->last_component ()->replace_string ( reply_handler_local_name.c_str ()); @@ -302,7 +302,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) reply_handler->set_name (reply_handler_name); reply_handler->set_defined_in (s); - + /// Store here for convenient retrieval later. node->ami_handler (reply_handler); @@ -349,7 +349,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) { be_operation *get_operation = this->generate_get_operation (attribute); - + this->create_reply_handler_operation (get_operation, reply_handler); @@ -395,7 +395,7 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node) reply_handler->is_ami_rh (true); reply_handler->is_ami4ccm_rh (true); - + return reply_handler; } @@ -423,7 +423,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) op_name->last_component ()->replace_string (new_op_name.c_str ()); idl_global->scopes ().push (node->defined_in ()); - + // Create the operation be_operation *op = 0; ACE_NEW_RETURN (op, @@ -433,7 +433,7 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) false, false), 0); - + idl_global->scopes ().pop (); op->set_name (op_name); @@ -467,11 +467,11 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node) be_interface *field_type = be_interface::narrow_from_decl (handler); - + ACE_NEW_RETURN (id, Identifier ("ami_handler"), 0); - + UTL_ScopedName *tmp = 0; ACE_NEW_RETURN (tmp, diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index deef051a509..95112d12455 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -88,7 +88,7 @@ be_visitor_any_extracted_type_decl::visit_predefined_type ( be_predefined_type *node) { os_ << node->full_name () << " "; - + switch (node->pt ()) { case AST_PredefinedType::PT_boolean: @@ -160,12 +160,12 @@ be_visitor_any_extracted_type_decl::visit_predefined_type ( os_ << "_ptr " << var_name_ << " = ::CORBA::TypeCode::_nil ();"; } - + break; default: // PT_void is left out of the case list. break; } - + return 0; } @@ -173,15 +173,15 @@ int be_visitor_any_extracted_type_decl::visit_sequence (be_sequence *node) { be_type *bt = this->ctx_->alias (); - + if (bt == 0) { bt = node; } - + os_ << "const " << bt->nested_type_name (idl_global->root ()) << " * " << var_name_ << " = 0;"; - + return 0; } @@ -204,7 +204,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node) { this->ctx_->alias (node); int status = node->primitive_base_type ()->accept (this); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -213,7 +213,7 @@ be_visitor_any_extracted_type_decl::visit_typedef (be_typedef *node) "accept on primitive type failed\n"), -1); } - + this->ctx_->alias (0); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp index c0e1ba75532..7572d3d3629 100644 --- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp @@ -159,7 +159,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node) << "TAO::Objref_Traits<" << node->name () << ">"; } - *os << "," << be_nl << this->insert_policy() + *os << "," << be_nl << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -419,7 +419,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << ">" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl @@ -554,7 +554,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) bool const skel = (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS); - + AST_Decl *op = ScopeAsDecl (node->defined_in ()); AST_Decl *intf = ScopeAsDecl (op->defined_in ()); ACE_CString arg_flat_name (intf->flat_name ()); @@ -581,7 +581,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node) << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt_nl @@ -614,10 +614,10 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node) os->gen_ifdef_macro (alias->flat_name (), guard_suffix.c_str (), false); - + bool use_vec = (node->unbounded () && be_global->alt_mapping ()); UTL_ScopedName *sn = alias->name (); - + *os << be_nl << be_nl << "template<>" << be_nl << "class " << this->S_ << "Arg_Traits<" << sn << ">" @@ -677,13 +677,13 @@ be_visitor_arg_traits::visit_string (be_string *node) // Form a unique macro name using the local name and the bound. ACE_CDR::ULong l = bound; int num_digits = 0; - + while (l > 0) { l /= 10 ; ++num_digits ; } - + size_t bound_length = num_digits + 1; char* bound_string = 0; ACE_NEW_RETURN (bound_string, char[bound_length], -1) ; @@ -748,7 +748,7 @@ be_visitor_arg_traits::visit_string (be_string *node) << be_idt << be_idt_nl << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl << bound << "," << be_nl - << this->insert_policy() + << this->insert_policy() << be_uidt << be_uidt_nl << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl @@ -932,7 +932,7 @@ be_visitor_arg_traits::visit_field (be_field *node) // recursion. So we set the field node as processed (the // field *type* may not have been reached yet) and return. AST_Decl::NodeType nt = bt->base_node_type (); - + if (nt == AST_Decl::NT_valuetype || nt == AST_Decl::NT_eventtype) { node->cli_traits_gen (true); diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp index adc708b7874..d1e0a803c07 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp @@ -88,7 +88,7 @@ int be_visitor_args_arglist::visit_array (be_array *node) int be_visitor_args_arglist::visit_enum (be_enum *node) { TAO_OutStream *os = this->ctx_->stream (); - + switch (this->direction ()) { case AST_Argument::dir_IN: @@ -303,7 +303,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node) { *os << this->type_name (node, "_out"); } - + break; } @@ -315,7 +315,7 @@ int be_visitor_args_arglist::visit_string (be_string *node) TAO_OutStream *os = this->ctx_->stream (); ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval; bool wide = (node->width () != (long) sizeof (char)); - + if (!wide && bound == 0 && be_global->alt_mapping ()) { switch (this->direction ()) @@ -327,7 +327,7 @@ int be_visitor_args_arglist::visit_string (be_string *node) *os << "std::string &"; break; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp index 9013b758b4f..309f5cf5f4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp @@ -94,29 +94,29 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, { TAO_CodeGen::CG_SUB_STATE ss = this->ctx_->sub_state (); AST_Argument::Direction d = this->direction (); - + bool in_arg = (d == AST_Argument::dir_IN); bool out_arg = (d == AST_Argument::dir_OUT); bool out_stream = (ss == TAO_CodeGen::TAO_CDR_OUTPUT); bool in_stream = (ss == TAO_CodeGen::TAO_CDR_INPUT); - + bool skip = (in_arg && for_stub && in_stream) || (in_arg && !for_stub && out_stream) || (out_arg && for_stub && out_stream) || (out_arg && !for_stub && in_stream); - + if (skip) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); const char *var_call = ""; const char *any_deref = ""; - + AST_PredefinedType::PredefinedType pt = node->pt (); bool is_any = (pt == AST_PredefinedType::PT_any); - + if (for_stub) { if (in_stream && out_arg) @@ -128,7 +128,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, else if (out_stream) { var_call = ".in ()"; - + if (is_any && !out_arg) { var_call = ""; @@ -138,17 +138,17 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, { var_call = ".out ()"; } - + ACE_CString to_from_str = (in_stream ? "::ACE_InputCDR::to_" : "::ACE_OutputCDR::from_"); - + const char *to_from = to_from_str.c_str (); - + be_argument *arg = be_argument::narrow_from_decl (this->ctx_->node ()); const char *lname = arg->local_name ()->get_string (); - + switch (pt) { case AST_PredefinedType::PT_any: @@ -173,7 +173,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node, *os << lname; break; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp index 7ce9b1e9ea5..8aad43b92ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp @@ -320,7 +320,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) << (wide ? "w" : "" ) << "string (" << lname << ".out (), " << bound << ")"; } - + break; case AST_Argument::dir_OUT: break; @@ -354,7 +354,7 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node) << (wide ? "w" : "" ) << "string ((" << (wide ? "CORBA::WChar" : "char") << " *)" << lname << ".in (), " << bound << ")"; - + break; } } @@ -517,7 +517,7 @@ be_visitor_args_marshal_ss::emit_common2 (be_type *node) case AST_Argument::dir_OUT: *os << lname << (st == AST_Type::VARIABLE ? ".in ()" : ""); - + break; } } diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp index 8a957354afe..657affc4e54 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp @@ -45,7 +45,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // Since we don't generate CDR stream operators for types that // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid @@ -81,7 +81,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) } // If this is non-zero, we want to call its tc_name() - // for the TypeCode to pass to the Any operator impls. + // for the TypeCode to pass to the Any operator impls. be_typedef *td = this->ctx_->tdef (); *os << "void operator<<= (" << be_idt << be_idt_nl @@ -122,7 +122,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node) << "}"; *os << be_global->core_versioning_end () << be_nl; - + node->cli_stub_any_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp index c6973b1a09c..3b9afef5262 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp @@ -131,7 +131,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node) ACE_OS::memset (fname, '\0', NAMEBUFSIZE); - + bool use_underscore = (this->ctx_->tdef () == 0); if (!use_underscore) diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp index e96a8cf10ec..8d00e9cce49 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor for code generation of Arrays for the + * Visitor for code generation of Arrays for the * TAO::DCPS::Serializer operators in the client header. * * @@ -32,7 +32,7 @@ be_visitor_array_serializer_op_ch::~be_visitor_array_serializer_op_ch (void) } -void +void be_visitor_array_serializer_op_ch::gen_arg_ref(be_array *node) { TAO_OutStream *os = this->ctx_->stream (); @@ -128,18 +128,18 @@ be_visitor_array_serializer_op_ch::visit_array (be_array *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; // Set the sub state as generating code for the size method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (" + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (" << "const "; this->gen_arg_ref(node); - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (" + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (" << "const "; this->gen_arg_ref(node); - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (" + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (" << "const "; this->gen_arg_ref(node); diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp index d9de2d00506..d266d09ec0b 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp @@ -59,7 +59,7 @@ be_visitor_array_serializer_op_cs::visit_array (be_array *node) "Bad base type\n"), -1); } - + AST_Decl::NodeType nt = bt->node_type (); // If we contain an anonymous sequence, diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp index 26b72c79093..ec009509444 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp @@ -56,36 +56,36 @@ be_visitor_attribute::visit_attribute (be_attribute *node) this->ctx_->node (node); this->ctx_->attribute (node); be_interface *intf = this->ctx_->interface (); - + if (intf != 0) { AST_Decl::NodeType snt = intf->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + if (snt == AST_Decl::NT_component && ant == AST_Decl::NT_porttype) { return 0; } } - + UTL_Scope *s = node->defined_in (); - AST_Decl *d = ScopeAsDecl (s); + AST_Decl *d = ScopeAsDecl (s); ACE_CString op_name (this->ctx_->port_prefix ()); op_name += node->local_name ()->get_string (); Identifier *op_id = 0; ACE_NEW_RETURN (op_id, Identifier (op_name.c_str ()), -1); - + UTL_ScopedName *op_ln = 0; ACE_NEW_RETURN (op_ln, UTL_ScopedName (op_id, 0), -1); - + UTL_ScopedName *op_sn = - static_cast<UTL_ScopedName *> (d->name ()->copy ()); + static_cast<UTL_ScopedName *> (d->name ()->copy ()); op_sn->nconc (op_ln); // first the "get" operation @@ -255,7 +255,7 @@ be_visitor_attribute::visit_attribute (be_attribute *node) node->name ()); arg->set_name ((UTL_IdList *) node->name ()->copy ()); - + // Create the operation. be_operation set_op (&rt, AST_Operation::OP_noflags, diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp index 3b64d85ef38..58163414043 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/ccm_init.cpp @@ -35,13 +35,13 @@ be_visitor_attribute_ccm_init::visit_attribute ( } be_interface *intf = this->ctx_->interface (); - + if (intf != 0) { AST_Decl::NodeType snt = intf->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + if (snt == AST_Decl::NT_component && ant == AST_Decl::NT_porttype) { @@ -216,7 +216,7 @@ be_visitor_attribute_ccm_init::emit_error ( const char *corba_kind) { this->open_if_block (); - + os_ << "ACE_ERROR ((LM_ERROR," << be_nl << " \"CCM attributes of " << corba_kind << "\"" << be_nl @@ -224,7 +224,7 @@ be_visitor_attribute_ccm_init::emit_error ( << "supported by CIAO\\n\"));" << be_nl << be_nl << "ACE_UNUSED_ARG (descr_value);" << be_nl; - + this->close_if_block (); } diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp index 51c67462c59..8ffa5d9ba30 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp @@ -105,7 +105,7 @@ be_visitor_attribute_set_from_extracted::visit_predefined_type ( default: // PT_void left out of case list. break; } - + return 0; } @@ -139,7 +139,7 @@ be_visitor_attribute_set_from_extracted::visit_typedef ( { be_type *pbt = be_type::narrow_from_decl (node->primitive_base_type ()); - + return (pbt->accept (this)); } diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 1dfac8b8822..f4277a73955 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -68,7 +68,7 @@ const int N_LW_EXCEPS = sizeof (LW_EXCEP_NAMES) / sizeof (char *); const int N_ADDL_EXCEPS = sizeof (ADDL_EXCEP_NAMES) / sizeof (char *); - + be_exception *LW_EXCEPS[N_LW_EXCEPS]; be_exception *ADDL_EXCEPS[N_ADDL_EXCEPS]; @@ -173,7 +173,7 @@ be_visitor_ccm_pre_proc::visit_component (be_component *node) ACE_TEXT ("lookups failed\n")), -1); } - + this->ccm_lookups_done_ = true; } @@ -1155,7 +1155,7 @@ be_visitor_ccm_pre_proc::gen_create (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; ACE_NEW_RETURN (tail, UTL_ExceptList (this->invalid_key_, @@ -1210,10 +1210,10 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; UTL_ExceptList *middle = 0; - + if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, @@ -1225,7 +1225,7 @@ be_visitor_ccm_pre_proc::gen_find_by_primary_key (be_home *node, tail), -1); } - + UTL_ExceptList *exceps = 0; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->finder_failure_, @@ -1272,10 +1272,10 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, -1); arg_id.destroy (); op->be_add_argument (arg); - + UTL_ExceptList *tail = 0; UTL_ExceptList *middle = 0; - + if (!be_global->gen_lwccm ()) { ACE_NEW_RETURN (tail, @@ -1287,7 +1287,7 @@ be_visitor_ccm_pre_proc::gen_remove (be_home *node, tail), -1); } - + UTL_ExceptList *exceps = 0; ACE_NEW_RETURN (exceps, UTL_ExceptList (this->remove_failure_, @@ -1415,7 +1415,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void) this->create_failure_ = LW_EXCEPS[4]; this->remove_failure_ = LW_EXCEPS[5]; this->finder_failure_ = LW_EXCEPS[6]; - + if (!be_global->gen_lwccm ()) { for (int j = 0; j < N_ADDL_EXCEPS; ++j) @@ -1433,7 +1433,7 @@ be_visitor_ccm_pre_proc::lookup_exceptions (void) this->unknown_key_value_ = ADDL_EXCEPS[1]; this->duplicate_key_value_ = ADDL_EXCEPS[2]; } - + return 0; } @@ -1718,7 +1718,7 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node, ScopeAsDecl (s)); node->set_name (mangled_name); AST_Module *m = AST_Module::narrow_from_scope (s); - + /// Calling be_add_interface() here calls add_to_referenced(), /// which will give a redef error. m->add_to_scope (retval); @@ -1867,7 +1867,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) be_interface *iface = be_interface::narrow_from_decl (u->uses_type ()); - + /// The real AMI_xxx exists only in the *A.idl file, so /// we create a dummy as the uses type for the implied /// receptacle created below, but only if it hasn't @@ -1879,7 +1879,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) if (ami_iface == 0) { ACE_CString iname ("AMI4CCM_"); - + iname += iface->local_name (); Identifier itmp_id (iname.c_str ()); UTL_ScopedName itmp_sn (&itmp_id, 0); @@ -1901,11 +1901,11 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) /// Make it imported so it doesn't trigger /// any unwanted code generation. ami_iface->set_imported (true); - + s->add_to_scope (ami_iface); iface->ami4ccm_uses (ami_iface); } - + /// Now create the receptacle, passing in /// the local interface created above as the /// uses type. We don't generate anything @@ -1928,7 +1928,7 @@ be_visitor_ccm_pre_proc::generate_ami4ccm_uses (void) s->add_to_scope (ami_uses); idl_global->scopes ().pop (); - + if (u->is_multiple ()) { /* diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp index 313280196b5..204ff9b79ad 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp @@ -322,9 +322,9 @@ be_visitor_component::visit_extended_port ( /// line to tell what scope we are actually in. this->ctx_->interface ( be_interface::narrow_from_scope (node->defined_in ())); - + be_porttype *pt = node->port_type (); - + if (this->visit_scope (pt) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -333,9 +333,9 @@ be_visitor_component::visit_extended_port ( ACE_TEXT ("visit_scope () failed\n")), -1); } - + this->ctx_->port_prefix () = ""; - + return 0; } @@ -351,9 +351,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node) /// line to tell what scope we are actually in. this->ctx_->interface ( be_interface::narrow_from_scope (node->defined_in ())); - + be_porttype *pt = node->port_type (); - + if (this->visit_scope (pt) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -362,9 +362,9 @@ be_visitor_component::visit_mirror_port (be_mirror_port *node) ACE_TEXT ("visit_scope () failed\n")), -1); } - + this->ctx_->port_prefix () = ""; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp index 7b0c602c31d..a51558a3928 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp @@ -35,7 +35,7 @@ be_visitor_component_ex_idl::visit_component ( if (be_global->gen_lem_force_all ()) { be_visitor_facet_ex_idl facet_visitor (this->ctx_); - + if (facet_visitor.visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,7 +49,7 @@ be_visitor_component_ex_idl::visit_component ( be_util::gen_nesting_open (os_, node); be_visitor_executor_ex_idl exec_visitor (this->ctx_); - + if (exec_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -60,7 +60,7 @@ be_visitor_component_ex_idl::visit_component ( } be_visitor_context_ex_idl context_visitor (this->ctx_); - + if (context_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp index 34c70b74ce8..f4f1df5c200 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp @@ -38,10 +38,10 @@ be_visitor_component_exh::visit_component (be_component *node) << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_exh facet_visitor (this->ctx_); facet_visitor.node (node); - + if (facet_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -50,9 +50,9 @@ be_visitor_component_exh::visit_component (be_component *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_exh exec_visitor (this->ctx_); - + if (exec_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -61,12 +61,12 @@ be_visitor_component_exh::visit_component (be_component *node) ACE_TEXT ("exec visitor failed\n")), -1); } - + this->gen_exec_entrypoint_decl (); os_ << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp index f5e01b0641c..2a019f2ffbd 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp @@ -38,7 +38,7 @@ be_visitor_component_exs::visit_component (be_component *node) << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_exs facet_visitor (this->ctx_); facet_visitor.node (node); @@ -50,7 +50,7 @@ be_visitor_component_exs::visit_component (be_component *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_exs exec_visitor (this->ctx_); if (exec_visitor.visit_component (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp index c6f749f3500..532a228dd95 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp @@ -42,14 +42,14 @@ be_visitor_component_svh::visit_component (be_component *node) { return 0; } - + /// Fills in the node's has_* members, for use in minimizing - /// code generation. + /// code generation. node->scan (node); - + // Generate the facet servant class declaration. be_visitor_facet_svh facet_visitor (this->ctx_); - + if (facet_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -77,8 +77,8 @@ be_visitor_component_svh::visit_component (be_component *node) ACE_TEXT ("context visitor failed\n")), -1); } - - // Generate the servant class declaration. + + // Generate the servant class declaration. be_visitor_servant_svh servant_visitor (this->ctx_); if (servant_visitor.visit_component (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp index e893c3152ec..90e435e8e13 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp @@ -157,7 +157,7 @@ be_visitor_context_svh::visit_uses (be_uses *node) << "virtual " << (is_multiple ? "::Components::Cookie *" : "void") << be_nl - << "connect_" << port_name << " (" + << "connect_" << port_name << " (" << "::" << obj_name << "_ptr);" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp index 309d9565a71..afe0d6f703d 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp @@ -29,7 +29,7 @@ be_visitor_executor_ex_idl::visit_component ( be_component *node) { node_ = node; - + AST_Component *base = node->base_component (); os_ << be_nl @@ -71,7 +71,7 @@ be_visitor_executor_ex_idl::visit_component ( os_ << be_uidt_nl << "};"; - + return 0; } @@ -87,7 +87,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node) AST_Decl::NodeType snt = this->node_->node_type (); AST_Decl::NodeType ant = ScopeAsDecl (node->defined_in ())->node_type (); - + /// For now, we want porttype attributes generated only for /// connectors. if (snt == AST_Decl::NT_component @@ -95,7 +95,7 @@ be_visitor_executor_ex_idl::visit_attribute (be_attribute *node) { return 0; } - + bool rd_only = node->readonly (); // Keep output statements separate because of side effects. @@ -181,11 +181,11 @@ be_visitor_executor_ex_idl::visit_provides ( ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); - + os_ << be_nl << global << sname << "::CCM_" << lname << " get_" << port_name << " ();"; - + return 0; } @@ -200,7 +200,7 @@ be_visitor_executor_ex_idl::visit_consumes ( << " (in ::" << IdentifierHelper::orig_sn (impl->name ()).c_str () << " e);"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 7f8158a9676..7a92f3d9e64 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -129,9 +129,9 @@ be_visitor_executor_exh::visit_component (be_component *node) << "private:" << be_idt_nl << global << sname << "::CCM_" << lname << "_Context_var ciao_context_;"; - + be_visitor_facet_private_exh v (this->ctx_); - + if (v.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -141,7 +141,7 @@ be_visitor_executor_exh::visit_component (be_component *node) ACE_TEXT ("visitor failed\n")), -1); } - + os_ << be_uidt_nl << "};"; @@ -154,7 +154,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node) ACE_CString prefix (this->ctx_->port_prefix ()); prefix += node->local_name ()->get_string (); const char *port_name = prefix.c_str (); - + be_type *impl = node->provides_type (); AST_Decl *scope = ScopeAsDecl (impl->defined_in ()); diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp index 3c5b2a7e57c..9587735aa6a 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp @@ -49,7 +49,7 @@ be_visitor_facet_ex_idl::visit_provides (be_provides *node) be_util::gen_nesting_close (os_, impl); impl->ex_idl_facet_gen (true); - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp index 767308e5659..dab06fc4270 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -33,25 +33,25 @@ be_visitor_facet_exh::visit_provides (be_provides *node) be_type *impl = node->provides_type (); const char *iname = impl->original_local_name ()->get_string (); - + ACE_CString lname_str (this->ctx_->port_prefix ()); lname_str += node->original_local_name ()->get_string (); const char *lname = lname_str.c_str (); - + AST_Decl *s = ScopeAsDecl (impl->defined_in ()); ACE_CString sname_str = IdentifierHelper::orig_sn (s->name (), false); const char *sname = sname_str.c_str (); const char *global = (sname_str == "" ? "" : "::"); - + AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (c_scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (is_global ? "" : "::"); - + os_ << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + os_ << be_nl << "class " << export_macro_.c_str () << " " << lname << "_exec_i" << be_idt_nl @@ -66,19 +66,19 @@ be_visitor_facet_exh::visit_provides (be_provides *node) << this->node_->local_name () << "_Context_ptr ctx);" << be_uidt_nl << "virtual ~" << lname << "_exec_i (void);"; - + if (impl->node_type () == AST_Decl::NT_interface) { be_interface *intf = be_interface::narrow_from_decl (impl); - + os_ << be_nl << be_nl << "// Operations and attributes from ::" << intf->full_name (); - - be_visitor_context ctx (*this->ctx_); + + be_visitor_context ctx (*this->ctx_); be_visitor_interface_ih v (&ctx); - + if (v.visit_scope (intf) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -88,7 +88,7 @@ be_visitor_facet_exh::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + int status = intf->traverse_inheritance_graph ( be_visitor_interface_ih::method_helper, @@ -104,14 +104,14 @@ be_visitor_facet_exh::visit_provides (be_provides *node) -1); } } - + os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << smart_scope << c_scope->full_name () << "::CCM_" << this->node_->local_name () << "_Context_var ciao_context_;" << be_uidt_nl << "};"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp index 571fd11ee29..1c12bac99a4 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp @@ -37,7 +37,7 @@ be_visitor_facet_exs::visit_operation (be_operation *node) { return 0; } - + be_visitor_operation_exs v (this->ctx_); v.scope (op_scope_); return v.visit_operation (node); @@ -55,7 +55,7 @@ be_visitor_facet_exs::visit_attribute (be_attribute *node) { return 0; } - + be_visitor_attribute v (this->ctx_); v.op_scope (op_scope_); return v.visit_attribute (node); @@ -73,7 +73,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) os_ << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + os_ << be_nl << comment_border_ << be_nl << "// Facet Executor Implementation Class: " @@ -83,7 +83,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) AST_Decl *c_scope = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (c_scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (is_global ? "" : "::"); - + os_ << be_nl << be_nl << lname << "_exec_i::" << lname << "_exec_i (" << be_idt << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp index 283da630487..0ae02cd2d82 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_private_exh.cpp @@ -32,13 +32,13 @@ be_visitor_facet_private_exh::visit_provides (be_provides *node) const char *smart_scope = (is_global ? "" : "::"); ACE_CString scope_name = IdentifierHelper::orig_sn (i_scope->name (), false); - + os_ << be_nl << smart_scope << scope_name.c_str () << "::CCM_" << impl->original_local_name () << "_var ciao_" << this->ctx_->port_prefix ().c_str () << node->original_local_name () << "_;"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp index 9453829ca70..71fc9da54d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp @@ -35,7 +35,7 @@ be_visitor_facet_svh::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp index cc7b2d59dc2..c9127923226 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp @@ -34,7 +34,7 @@ be_visitor_facet_svs::visit_provides (be_provides *node) ACE_TEXT ("failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 47193d68f21..1eaab8d0b16 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -198,7 +198,7 @@ be_visitor_servant_svh::visit_uses (be_uses *node) << "virtual " << (is_multiple ? "::Components::Cookie *" : "void") << be_nl - << "connect_" << port_name << " (" + << "connect_" << port_name << " (" << "::" << obj_name << "_ptr);" << be_nl << be_nl; @@ -370,7 +370,7 @@ be_visitor_servant_svh::gen_non_type_specific (void) << "virtual ::CORBA::Object_ptr " << be_nl << "disconnect (const char * name, ::Components::Cookie * ck);"; } - + if (!be_global->gen_lwccm ()) { os_ << be_nl << be_nl @@ -378,7 +378,7 @@ be_visitor_servant_svh::gen_non_type_specific (void) << be_nl << "get_all_receptacles (void);"; } - + AST_Decl::NodeType nt = this->node_->node_type (); bool is_connector = (nt == AST_Decl::NT_connector); diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 07c853fdbd4..845545cf79f 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -92,7 +92,7 @@ be_visitor_servant_svs::visit_component (be_component *node) || this->node_->n_consumes () > 0UL) { be_visitor_populate_port_tables ppt_visitor (this->ctx_); - + if (ppt_visitor.visit_component_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -128,7 +128,7 @@ be_visitor_servant_svs::visit_component (be_component *node) << "::CORBA::Any & descr_value = descr[i]->value ();"; be_visitor_attr_set as_visitor (this->ctx_); - + /// This will get assigned to the visitor's interface_ /// member later so it can catch and skip porttype /// attributes in a component. @@ -166,7 +166,7 @@ be_visitor_servant_svs::visit_component (be_component *node) &os_, false, false); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -720,7 +720,7 @@ be_visitor_servant_svs::gen_publishes_top (void) << "throw ::Components::InvalidName ();" << be_uidt_nl << "}"; } - + if (!be_global->gen_lwccm ()) { os_ << be_nl << be_nl @@ -765,9 +765,9 @@ void be_visitor_servant_svs::gen_uses_top (void) { ACE_CDR::ULong nuses = this->node_->n_uses (); - + if (nuses > 0UL) - { + { os_ << be_nl << be_nl << "::Components::Cookie *" << be_nl << node_->local_name () << "_Servant::connect (" diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp index 09aa5f42b18..f2669690cb1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for Any operators for a forward declared + * Visitor generating code for Any operators for a forward declared * component in the client header. * * diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index 0e9d0106063..657bb304213 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -123,7 +123,7 @@ be_visitor_component_scope::visit_component_scope ( { return 0; } - + this->ctx_->interface (node); if (this->visit_scope (node) == -1) @@ -209,7 +209,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror ( d->full_name ()), -1); } - + break; } } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp index 6f6ec2d1864..52efb700705 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp @@ -34,18 +34,18 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + be_visitor_facet_ami_exh facet_visitor (this->ctx_); - + /// We call visit_component() so the visitor base class member /// node_ can be set. If a facet is defined in a porttype, it /// complicates navigation to the component. @@ -57,9 +57,9 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("facet visitor failed\n")), -1); } - + be_visitor_executor_ami_exh exec_visitor (this->ctx_); - + if (exec_visitor.visit_connector (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -68,25 +68,25 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("exec visitor failed\n")), -1); } - + this->gen_entrypoint (); - + os_ << be_uidt_nl << "}"; - + /// Presence of -Gex option here triggers generation of AMI4CCM /// reply handler impl class, with empty methods for user to - /// complete, in its own set of files. + /// complete, in its own set of files. if (be_global->gen_ciao_exec_impl ()) { TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_header (); - + if (new_stream == 0) { int status = tao_cg->start_ciao_ami_rh_impl_header ( be_global->be_get_ciao_ami_conn_impl_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -96,16 +96,16 @@ be_visitor_connector_ami_exh::visit_connector (be_connector *node) ACE_TEXT ("conn rh impl header file\n")), -1); } - + new_stream = tao_cg->ciao_ami_rh_impl_header (); } - + /// Initialize new visitor with a copy of our context, /// because the new visitor gets a different stream. be_visitor_context new_ctx (*this->ctx_); new_ctx.stream (new_stream); be_visitor_connector_ami_rh_exh impl_visitor (&new_ctx); - + if (impl_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp index f1b53b52eeb..d0a014c3a71 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp @@ -69,17 +69,17 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node) /// Presence of -Gex option here triggers generation of AMI4CCM /// reply handler impl class, with empty methods for user to - /// complete, in its own set of files. + /// complete, in its own set of files. if (be_global->gen_ciao_exec_impl ()) { TAO_OutStream *new_stream = tao_cg->ciao_ami_rh_impl_source (); - + if (new_stream == 0) { int status = tao_cg->start_ciao_ami_rh_impl_source ( be_global->be_get_ciao_ami_conn_impl_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -89,16 +89,16 @@ be_visitor_connector_ami_exs::visit_connector (be_connector *node) ACE_TEXT ("conn rh impl header file\n")), -1); } - + new_stream = tao_cg->ciao_ami_rh_impl_source (); } - + /// Initialize new visitor with a copy of our context, /// because the new visitor gets a different stream. be_visitor_context new_ctx (*this->ctx_); new_ctx.stream (new_stream); be_visitor_connector_ami_rh_exs impl_visitor (&new_ctx); - + if (impl_visitor.visit_component (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp index 190bd27a1c2..47a5f6ee6c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exh.cpp @@ -29,16 +29,16 @@ be_visitor_connector_ami_rh_exh::visit_component (be_component *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -48,10 +48,10 @@ be_visitor_connector_ami_rh_exh::visit_component (be_component *node) ACE_TEXT ("failed\n")), -1); } - + os_ << be_uidt_nl << "}"; - + return 0; } @@ -62,9 +62,9 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) be_interface::narrow_from_decl (node->provides_type ()); this->init (true); - + const char *suffix = "ReplyHandler"; - + os_ << be_nl << "class " << this->export_macro_.c_str () << " " << this->iface_name_ << suffix << "_i" << be_idt_nl @@ -74,7 +74,7 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) << "public:" << be_idt_nl << this->iface_name_ << suffix << "_i (void);" << be_nl << "virtual ~" << this->iface_name_ << suffix << "_i (void);"; - + /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. this->callback_iface_->get_insert_queue ().reset (); @@ -99,7 +99,7 @@ be_visitor_connector_ami_rh_exh::visit_provides (be_provides *node) ACE_TEXT ("callback interface failed\n")), -1); } - + os_ << be_uidt_nl << "};"; @@ -113,9 +113,9 @@ be_visitor_connector_ami_rh_exh::visit_attribute ( this->ctx_->interface (this->callback_iface_); TAO_CodeGen::CG_STATE state = this->ctx_->state (); this->ctx_->state (TAO_CodeGen::TAO_ROOT_IH); - + be_visitor_attribute v (this->ctx_); - + if (v.visit_attribute (node) == -1) { ACE_ERROR ((LM_ERROR, @@ -124,9 +124,9 @@ be_visitor_connector_ami_rh_exh::visit_attribute ( ACE_TEXT ("be_visitor_attribute:: ") ACE_TEXT ("visit_attribute failed\n"))); } - + this->ctx_->state (state); - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp index 65bb3156cfc..06c787e8f46 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_rh_exs.cpp @@ -30,16 +30,16 @@ be_visitor_connector_ami_rh_exs::visit_component (be_component *node) { return 0; } - + this->node_ = node; - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << node->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -49,10 +49,10 @@ be_visitor_connector_ami_rh_exs::visit_component (be_component *node) ACE_TEXT ("failed\n")), -1); } - + os_ << be_uidt_nl << "}"; - + return 0; } @@ -63,24 +63,24 @@ be_visitor_connector_ami_rh_exs::visit_provides (be_provides *node) be_interface::narrow_from_decl (node->provides_type ()); this->init (true); - + const char *suffix = "ReplyHandler_i"; - + os_ << be_nl << this->iface_name_ << suffix << "::" << this->iface_name_ << suffix << " (void)" << be_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << this->iface_name_ << suffix << "::~" << this->iface_name_ << suffix << " (void)" << be_nl << "{" << be_nl << "}"; - + ACE_CString port_pfix = this->ctx_->port_prefix (); this->ctx_->port_prefix () = ""; - + /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. this->callback_iface_->get_insert_queue ().reset (); @@ -105,8 +105,8 @@ be_visitor_connector_ami_rh_exs::visit_provides (be_provides *node) ACE_TEXT ("callback interface failed\n")), -1); } - - this->ctx_->port_prefix () = port_pfix; + + this->ctx_->port_prefix () = port_pfix; return 0; } @@ -115,12 +115,12 @@ be_visitor_connector_ami_rh_exs::visit_operation ( be_operation *node) { AST_Decl::NodeType nt = node->defined_in ()->scope_node_type (); - + if (nt != AST_Decl::NT_interface) { return 0; } - + be_visitor_operation_exs v (this->ctx_); v.scope (this->callback_iface_); v.class_extension ("_i"); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp index 7a984d168ce..b5c1167371d 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp @@ -44,7 +44,7 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node) if (this->t_args_ == 0) { this->process_template_args (node); - + if (this->t_args_ == 0) { return false; @@ -58,8 +58,8 @@ be_visitor_connector_dds_ex_base::begin (be_connector *node) << "_Impl" << be_nl << "{" << be_idt; - this->base_tname_ = node->local_name (); - + this->base_tname_ = node->local_name (); + return true; } @@ -69,7 +69,7 @@ be_visitor_connector_dds_ex_base::process_template_args ( { AST_Module *m = AST_Module::narrow_from_scope (node->defined_in ()); - + /// We assume the connector comes from the instantiation /// of a template module, and the regular module it's /// defined in (at some level) will have a reference to it. diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 7874bf9b22f..918a39c2de4 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -39,10 +39,10 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) { return -1; } - + this->gen_dds_traits (); this->gen_connector_traits (); - + /// Unset the flags in the port interfaces list so /// they can be used again in another connector. for (ACE_Unbounded_Queue<be_interface *>::ITERATOR iter ( @@ -52,10 +52,10 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) { be_interface **item = 0; iter.next (item); - + (*item)->dds_connector_traits_done (false); } - + /// Assumes parent connector exists and is either DDS_State /// or DDS_Event, so we generate inheritance from the /// corresponding template. May have to generalize this logic. @@ -116,9 +116,9 @@ be_visitor_connector_dds_exh::visit_provides (be_provides *node) { be_interface *iface = be_interface::narrow_from_decl (node->provides_type ()); - + this->gen_interface_connector_trait (iface, true); - + return 0; } @@ -127,9 +127,9 @@ be_visitor_connector_dds_exh::visit_uses (be_uses *node) { be_interface *iface = be_interface::narrow_from_decl (node->uses_type ()); - + this->gen_interface_connector_trait (iface, false); - + return 0; } @@ -166,7 +166,7 @@ be_visitor_connector_dds_exh::gen_dds_traits (void) { os_ << "RTI"; } - + os_ << "Seq dds_seq_type;" << be_nl << "typedef ::" << dt_name << "TypeSupport type_support;" << be_nl @@ -214,9 +214,9 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) bool global_comp = (comp_scope->node_type () == AST_Decl::NT_root); - + os_ << be_nl << be_nl - << "struct DDS_" << this->node_->local_name () + << "struct DDS_" << this->node_->local_name () << "_Traits" << be_nl << "{" << be_idt_nl << "typedef ::CIAO_" << this->node_->flat_name () << "_Impl::" @@ -226,7 +226,7 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) << "typedef " << (global_comp ? "" : "::") << comp_scope->name () << "::CCM_" << this->node_->local_name () << "_Context context_type;"; - + if (this->visit_component_scope (this->node_) == -1) { ACE_ERROR ((LM_ERROR, @@ -236,7 +236,7 @@ be_visitor_connector_dds_exh::gen_connector_traits (void) return; } - + os_ << be_uidt_nl << "};"; } @@ -247,18 +247,18 @@ be_visitor_connector_dds_exh::gen_interface_connector_trait ( bool for_facet) { if (!iface->dds_connector_traits_done ()) - { + { AST_Decl *scope = ScopeAsDecl (iface->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); const char *lname = iface->local_name (); - + os_ << be_nl << "typedef ::" << scope->name () << smart_scope << (for_facet ? "CCM_" : "") << lname << " " << tao_cg->downcase (lname) << "_type;"; - - iface->dds_connector_traits_done (true); + + iface->dds_connector_traits_done (true); this->port_ifaces_.enqueue_tail (iface); } } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index 0b244cfb1d8..c591e26d5b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -39,7 +39,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) { return -1; } - + os_ << be_nl << this->node_->local_name () << "_exec_i::" << this->node_->local_name () << "_exec_i (void)" @@ -78,7 +78,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) } os_ << "DDS4CCM_NDDS" << ">"; - + os_ << "()" << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp index 06fb1124656..48143a2d78f 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp @@ -47,7 +47,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << scope->local_name () << suffix << " (void);" << be_nl << "virtual ~" << scope->local_name () << suffix << " (void);"; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -58,7 +58,7 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) } os_ << be_nl << be_nl - << "virtual void set_session_context (" + << "virtual void set_session_context (" << "::Components::SessionContext_ptr ctx);" << be_nl << be_nl << "virtual void configuration_complete (void);" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp index f5d737fd83a..41233256b86 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp @@ -33,13 +33,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) ACE_CString class_name_str (scope->local_name ()->get_string ()); class_name_str += suffix; const char *class_name = class_name_str.c_str (); - + os_ << be_nl << be_nl << class_name << "::" << class_name << " (void)" << be_idt_nl << ": facet_exec_ (new "; - - /// The port is the only item in the connector's scope. + + /// The port is the only item in the connector's scope. UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls); AST_Extended_Port *p = AST_Extended_Port::narrow_from_decl (j.item ()); @@ -50,24 +50,24 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) { AST_Decl *d = i.item (); AST_Provides *p = AST_Provides::narrow_from_decl (d); - + if (p != 0) { os_ << p->provides_type ()->local_name (); } } - + os_ << suffix << " ())" << be_uidt_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << class_name << "::~" << class_name << " (void)" << be_nl << "{" << be_idt_nl << "::CORBA::release (this->facet_exec_);" << be_uidt_nl << "}"; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -76,7 +76,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) ACE_TEXT ("visit_scope() failed\n")), -1); } - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::set_session_context (" << be_idt_nl @@ -86,26 +86,26 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) << "this->facet_exec_->set_session_context " << "(ctx);" << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::configuration_complete (void)" << be_nl << "{" << be_idt_nl << "this->facet_exec_->_set_component (this);" << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::ccm_activate (void)" << be_nl << "{" << be_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << class_name << "::ccm_passivate (void)" << be_nl << "{" << be_nl << "}"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -120,7 +120,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) << "CCM_" << this->node_->local_name () << "::_nil ());" << be_uidt << be_uidt_nl << "}"; - + return 0; } @@ -131,18 +131,18 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) AST_Decl *scope = ScopeAsDecl (t->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); - + os_ << be_nl << be_nl << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "_ptr" << be_nl << ScopeAsDecl (this->node_->defined_in ())->local_name () << "_exec_i::get_"; - + /// The port is the only thing in the connector's scope, and - /// we need to insert its name into the operation name. + /// we need to insert its name into the operation name. UTL_ScopeActiveIterator i (this->node_, UTL_Scope::IK_decls); AST_Decl *d = i.item (); - + os_ << d->local_name () << "_" << node->local_name () << " (void)" << be_nl << "{" << be_idt_nl @@ -150,7 +150,7 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate (" << "this->facet_exec_);" << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index 92916335bc3..548c623aec6 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -88,7 +88,7 @@ be_visitor_facet_ami_exh::visit_operation (be_operation *node) { return 0; } - + /// We're generating implementation operation declarations, /// so we can just use this visitor. be_visitor_operation_ih v (this->ctx_); @@ -124,7 +124,7 @@ be_visitor_facet_ami_exh::init (bool for_impl) /// by -GC, which must be applied to this IDL file. this->handler_str_ = this->scope_name_; this->handler_str_ += this->smart_scope_; - + this->handler_str_ += (for_impl ? "" : "AMI_"); ACE_CString tmp (this->iface_name_); this->handler_str_ += @@ -211,7 +211,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) << iface_name << suffix << " (void);" << be_nl << be_nl << "virtual ~" << iface_name << suffix << " (void);"; - + if (this->visit_scope (this->iface_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -221,11 +221,11 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) ACE_TEXT ("interface failed\n")), -1); } - + os_ << be_nl << be_nl - << "virtual void set_session_context (" + << "virtual void set_session_context (" << "::Components::SessionContext_ptr ctx);"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -233,13 +233,13 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void) os_ << be_nl << be_nl << "virtual ::CORBA::Object_ptr _get_component (void);"; - + os_ << be_nl << be_nl << "virtual void _set_component (" << be_idt_nl << "::" << s->name () << smart_scope << "CCM_" << this->node_->local_name () << "_ptr);" << be_uidt; - + os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << "::" << s->name () << smart_scope diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index f0593049bdc..486e2ae00bd 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -256,7 +256,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) << "throw ::CORBA::INTERNAL ();" << be_uidt_nl << "}" << be_uidt << be_uidt_nl << "}"; - + AST_Decl *s = ScopeAsDecl (this->node_->defined_in ()); bool is_global = (s->node_type () == AST_Decl::NT_root); @@ -273,7 +273,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void) << "this->component_.in ());" << be_uidt << be_uidt << be_uidt_nl << "}"; - + os_ << be_nl << be_nl << "void" << be_nl << iface_name << "_exec_i::_set_component (" << be_idt_nl @@ -334,7 +334,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) os_ << "if (! ::CORBA::is_nil (this->callback_.in ()))" << be_idt_nl << "{" << be_idt_nl; - + if (is_excep) { os_ << "::CCM_AMI::ExceptionHolder_i holder (excep_holder);" @@ -366,7 +366,7 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node) } os_ << be_uidt_nl << "}" << be_uidt_nl; - + os_ << be_nl << "::PortableServer::ObjectId_var oid =" << be_idt_nl << "this->poa_->servant_to_id (this);" << be_uidt_nl @@ -395,11 +395,11 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) ACE_TEXT ("list failed\n")), -1); } - + AST_Decl *scope = ScopeAsDecl (this->iface_->defined_in ()); bool global = (scope->node_type () == AST_Decl::NT_root); const char *smart_scope = (global ? "" : "::"); - + const char *prefix = "AMI4CCM_"; ACE_CString iface_str (this->iface_->local_name ()); ACE_CString orig_iface_str ( @@ -412,14 +412,14 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) << orig_iface_name << "_var receptacle_objref =" << be_idt_nl << "this->context_->get_connection_ami4ccm_port_ami4ccm_uses ();" << be_uidt_nl << be_nl; - + os_ << "if (! ::CORBA::is_nil (receptacle_objref.in ()))" << be_idt_nl << "{" << be_idt_nl << "::" << scope->full_name () << smart_scope << "AMI_" << orig_iface_name << "Handler_var the_handler_var;" << be_nl << be_nl; - + os_ << "if (! ::CORBA::is_nil (ami_handler))" << be_idt_nl << "{" << be_idt_nl << "::CIAO::Context_Impl_Base *ctx_base =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp index 58d6e600d15..1b8d5fb836a 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -39,7 +39,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node) } AST_Decl::NodeType snt = node->defined_in ()->scope_node_type (); - bool in_class = (snt != AST_Decl::NT_root + bool in_class = (snt != AST_Decl::NT_root && snt != AST_Decl::NT_module); if (be_global->gen_inline_constants () && !in_class) { @@ -69,7 +69,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node) *os << "#ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE" << be_nl << " "; } *os << "const "; - + if (node->et () == AST_Expression::EV_enum) { *os << node->enum_full_name (); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp index 2761135062a..0b400431c6e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp @@ -43,7 +43,7 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__; be_module *module = 0; - + if (node->is_nested ()) { AST_Decl *d = node; @@ -68,18 +68,18 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + // Generate the Any <<= and >>= operators. *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () << ");" << be_nl; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ::" << node->name () << " &);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp index 26686877228..f6cc65f415a 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp @@ -72,7 +72,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "}" << be_uidt_nl << "}" << be_nl << be_nl; } - + *os << be_global->core_versioning_end () << be_nl; @@ -101,10 +101,10 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) // Some compilers handle "any" operators in a namespace corresponding // to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - - + + // Generate the Any <<= and >>= operator declarations // Any <<= and >>= operators. *os << "void operator<<= (" << be_idt << be_idt_nl @@ -119,7 +119,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - + *os << "::CORBA::Boolean operator>>= (" << be_idt << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl << "::" << node->name () << " &_tao_elem" << be_uidt_nl @@ -133,9 +133,9 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node) << "_tao_elem " << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp index fcac3e1c015..1ca558b725e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp @@ -48,7 +48,7 @@ be_visitor_enum_cdr_op_ch::visit_enum (be_enum *node) *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &strm, " << node->name () << " &_tao_enumerator);" << be_nl; - + if (be_global->gen_ostream_operators ()) { *os << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp index cc754ea58da..126c5f4835c 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node) << "}" << be_uidt_nl << be_nl << "return _tao_success;" << be_uidt_nl << "}" << be_nl; - + if (be_global->gen_ostream_operators ()) { node->gen_ostream_operator (os, false); diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp index dbe1732044e..43a1f062c0e 100644 --- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitors for generation of code for Enum for the + * Visitors for generation of code for Enum for the * TAO::DCPS::Serializer operators * * diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp index cf5f5d9ed18..31bd6886bf4 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp @@ -68,9 +68,9 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; @@ -80,17 +80,17 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; - + *os << be_nl << be_nl << macro << " void operator<<= (::CORBA::Any &, const " << node->name () << " &); // copying version" << be_nl; @@ -107,7 +107,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node) { *os << "\n\n#endif"; } - + // All we have to do is to visit the scope and generate code. if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp index 7295a43fa2a..48c386cc626 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp @@ -110,7 +110,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}" << be_uidt_nl << "}"; } - + *os << be_global->core_versioning_end () << be_nl; be_module *module = 0; @@ -204,16 +204,16 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; } } - - + + *os << be_global->core_versioning_begin () << be_nl; // Copying insertion operator. @@ -281,12 +281,12 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node) << "}"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; } - + // all we have to do is to visit the scope and generate code if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp index 70351c7ebcf..dd99bcb8f51 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp @@ -69,7 +69,7 @@ be_visitor_exception_cdr_op_ch::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_ch::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp index 6b4a0e5759e..83ffd94c97e 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp @@ -39,7 +39,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -71,9 +71,9 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } // some members *os << "// First marshal the repository ID." << be_nl @@ -87,7 +87,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -150,7 +150,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception_cdr_op_cs::" "visit_exception - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -178,7 +178,7 @@ int be_visitor_exception_cdr_op_cs::post_process (be_decl *bd) { // This checks for members of an enum 'non-scope' declared inside - // the exception. If an enum val is actually a member, it will + // the exception. If an enum val is actually a member, it will // have node type NT_field. if (bd->node_type () == AST_Decl::NT_enum_val) { diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp index f7004e00d38..19f6b90b04e 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp @@ -147,13 +147,13 @@ be_visitor_exception_ctor_assign::visit_interface (be_interface *node) if (this->ctx_->exception ()) // Special constructor. { *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<" - << node->name () << ">::duplicate (_tao_" + << node->name () << ">::duplicate (_tao_" << bd->local_name () << ");"; } else { *os << "this->" << bd->local_name () << " = TAO::Objref_Traits<" - << node->name () << ">::duplicate (_tao_excp." + << node->name () << ">::duplicate (_tao_excp." << bd->local_name () << ".in ());"; } @@ -350,7 +350,7 @@ be_visitor_exception_ctor_assign::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -381,7 +381,7 @@ be_visitor_exception_ctor_assign::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp index 5464067f9ee..e9e2a557895 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp @@ -40,7 +40,7 @@ int be_visitor_exception_ci::visit_exception (be_exception *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_exception::" "visit_exception -" - "code for inline failed\n"), + "code for inline failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp index ff8de1848d2..b2b33af37b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp @@ -397,7 +397,7 @@ be_visitor_exception_ctor::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -435,7 +435,7 @@ be_visitor_exception_ctor::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp index c3337ae628f..be27d59a7c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp @@ -46,7 +46,7 @@ be_visitor_field_cdr_op_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -89,7 +89,7 @@ be_visitor_field_cdr_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cdr_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -189,7 +189,7 @@ be_visitor_field_cdr_op_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -251,7 +251,7 @@ be_visitor_field_cdr_op_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp index 707c33f646c..3ff50b0805a 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp @@ -775,7 +775,7 @@ be_visitor_field_cdr_op_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -869,7 +869,7 @@ be_visitor_field_cdr_op_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp index 35a9011d92f..a56468bda53 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp @@ -459,7 +459,7 @@ be_visitor_field_ch::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -546,7 +546,7 @@ be_visitor_field_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp index 83dc00f14ea..f7ac597e587 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp @@ -30,13 +30,13 @@ be_visitor_field_ci::visit_field (be_field *node) { be_type *bt = be_type::narrow_from_decl (node->field_type ()); - + if (!bt) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -47,7 +47,7 @@ be_visitor_field_ci::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -71,7 +71,7 @@ be_visitor_field_ci::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -100,7 +100,7 @@ be_visitor_field_ci::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -114,7 +114,7 @@ be_visitor_field_ci::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -129,7 +129,7 @@ be_visitor_field_ci::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -152,7 +152,7 @@ be_visitor_field_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_ci::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -165,7 +165,7 @@ be_visitor_field_ci::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp index 348139582bc..278aa734ac1 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp @@ -41,7 +41,7 @@ be_visitor_field_cs::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -52,7 +52,7 @@ be_visitor_field_cs::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -74,7 +74,7 @@ be_visitor_field_cs::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -97,7 +97,7 @@ be_visitor_field_cs::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -120,7 +120,7 @@ be_visitor_field_cs::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -143,7 +143,7 @@ be_visitor_field_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -157,7 +157,7 @@ be_visitor_field_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -172,7 +172,7 @@ be_visitor_field_cs::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_ci::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -195,7 +195,7 @@ be_visitor_field_cs::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_cs::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -208,7 +208,7 @@ be_visitor_field_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp index 48891c1aead..d18d39805a5 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating TAO::DCPS::Serializer operator declarator for field + * Visitor generating TAO::DCPS::Serializer operator declarator for field * in the client header * * @@ -48,7 +48,7 @@ be_visitor_field_serializer_op_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -91,7 +91,7 @@ be_visitor_field_serializer_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_field_serializer_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp index d01d7c8fd06..79f06724d11 100644 --- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp @@ -782,7 +782,7 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node) if (node->node_type() == AST_Decl::NT_wstring) { *os << "_dcps_max_marshaled_size_ulong() + " - << "(_tao_aggregate." << f->local_name () << ".in () ? " + << "(_tao_aggregate." << f->local_name () << ".in () ? " << "ACE_OS::strlen(_tao_aggregate." << f->local_name () << ".in ()) * sizeof (CORBA::WChar) : 0)"; } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index 8490704fe76..7e11bcf5344 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -36,16 +36,16 @@ be_visitor_home_exh::visit_home (be_home *node) { return 0; } - + node_ = node; comp_ = node_->managed_component (); - + /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl << be_nl << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl << "{" << be_idt; - + if (this->gen_exec_class () == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -54,12 +54,12 @@ be_visitor_home_exh::visit_home (be_home *node) ACE_TEXT ("gen_servant_class() failed\n")), -1); } - + this->gen_entrypoint (); os_ << be_uidt_nl << "}"; - + return 0; } @@ -83,10 +83,10 @@ be_visitor_home_exh::visit_factory (be_factory *node) os_ << be_nl << be_nl << "virtual ::Components::EnterpriseComponent_ptr" << be_nl << node->local_name (); - + // We can reuse this visitor. be_visitor_valuetype_init_arglist_ch v (this->ctx_); - + if (v.visit_factory (node) != 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -96,9 +96,9 @@ be_visitor_home_exh::visit_factory (be_factory *node) ACE_TEXT ("list failed\n")), -1); } - + os_ << ";"; - + return 0; } @@ -108,7 +108,7 @@ be_visitor_home_exh::gen_exec_class (void) // We don't want a '_cxx_' prefix here. const char *lname = node_->original_local_name ()->get_string (); - + os_ << be_nl << "class " << export_macro_.c_str () << " " << lname << "_exec_i" << be_idt_nl @@ -117,15 +117,15 @@ be_visitor_home_exh::gen_exec_class (void) << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt; - + os_ << be_nl << lname << "_exec_i (void);"; - + os_ << be_nl << be_nl << "virtual ~" << lname << "_exec_i (void);"; - + be_home *h = node_; - + while (h != 0) { if (this->visit_scope (h) != 0) @@ -136,19 +136,19 @@ be_visitor_home_exh::gen_exec_class (void) ACE_TEXT ("visit_scope() failed\n")), -1); } - + for (long i = 0; i < h->n_inherits (); ++i) { // A closure of all the supported interfaces is stored // in the base class 'pd_inherits_flat' member. be_interface *bi = be_interface::narrow_from_decl (h->inherits ()[i]); - + int status = bi->traverse_inheritance_graph ( be_visitor_home_exh::op_attr_decl_helper, &os_); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -159,21 +159,21 @@ be_visitor_home_exh::gen_exec_class (void) bi->full_name ()), -1); } - } - + } + h = be_home::narrow_from_decl (h->base_home ()); } - + os_ << be_nl << be_nl << "// Implicit operations."; - + os_ << be_nl << be_nl << "virtual ::Components::EnterpriseComponent_ptr" << be_nl << "create (void);"; os_ << be_uidt_nl << "};"; - + return 0; } @@ -184,7 +184,7 @@ be_visitor_home_exh::gen_entrypoint (void) << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl (void);"; } int @@ -198,8 +198,8 @@ be_visitor_home_exh::op_attr_decl_helper (be_interface * /* derived */, ctx.state (TAO_CodeGen::TAO_ROOT_EXH); ctx.stream (os); be_visitor_home_exh visitor (&ctx); - - /// Since this visitor overriddes only visit_operation() and + + /// Since this visitor overriddes only visit_operation() and /// visit_attribute(), we can get away with this for the declarations. return visitor.visit_scope (ancestor); } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index a57c9e65a34..ff1010a5022 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -140,9 +140,9 @@ be_visitor_home_exs::gen_exec_class (void) << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl << "{" << be_nl << "}"; - + be_home *h = node_; - + while (h != 0) { if (this->visit_scope (h) != 0) @@ -154,14 +154,14 @@ be_visitor_home_exs::gen_exec_class (void) ACE_TEXT ("failed\n")), -1); } - + for (long i = 0; i < h->n_inherits (); ++i) { // A closure of all the supported interfaces is stored // in the base class 'pd_inherits_flat' member. be_interface *bi = be_interface::narrow_from_decl (h->inherits ()[i]); - + bi->get_insert_queue ().reset (); bi->get_del_queue ().reset (); bi->get_insert_queue ().enqueue_tail (bi); @@ -184,8 +184,8 @@ be_visitor_home_exs::gen_exec_class (void) bi->full_name ()), -1); } - } - + } + h = be_home::narrow_from_decl (h->base_home ()); } diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index 458afe2be1d..980a516ed8d 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -444,7 +444,7 @@ be_visitor_home_attr_set::visit_home (be_home *node) i.next ()) { be_decl *d = be_decl::narrow_from_decl (i.item ()); - + if (d->accept (this) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -454,9 +454,9 @@ be_visitor_home_attr_set::visit_home (be_home *node) -1); } } - + be_home *h = be_home::narrow_from_decl (node->base_home ()); - + return this->visit_home (h); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp index 9969e0061be..f86dbe4ef89 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp @@ -120,13 +120,13 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, { be_operation *op = be_operation::narrow_from_decl (d); - + /// These implied IDL operations are for stub-side only. if (op->is_sendc_ami ()) { continue; } - + *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -165,7 +165,7 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, { return -1; } - + *os << be_nl << be_nl; // Generate code in the inline file. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp index efbe6efee68..7913f7d0fa4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_rh_ex_idl.cpp @@ -36,53 +36,53 @@ be_visitor_ami4ccm_rh_ex_idl::visit_interface (be_interface *node) << node->original_local_name () << "ReplyHandler" << be_idt_nl << ": "; - + long n_parents = node->n_inherits (); - + if (n_parents == 0) - { + { os_ << "::CCM_AMI::ReplyHandler"; } else { os_ << be_idt; - + for (long i = 0; i < n_parents; ++i) { if (i != 0) { os_ << "," << be_nl; } - + AST_Type *parent = node->inherits ()[i]; - + AST_Decl *d = ScopeAsDecl (parent->defined_in ()); - + bool global = (d->node_type () == AST_Decl::NT_root); - + os_ << (global ? "" : "::") << d->full_name () << "::AMI4CCM_" << parent->original_local_name () << "ReplyHandler"; } - + os_ << be_uidt; } - + os_ << be_uidt_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl") ACE_TEXT ("::visit_interface - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << be_uidt_nl << "};"; - + return 0; } @@ -94,7 +94,7 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + if (node->is_sendc_ami ()) { return 0; @@ -103,37 +103,37 @@ be_visitor_ami4ccm_rh_ex_idl::visit_operation (be_operation *node) os_ << be_nl << "void " << node->original_local_name () << " (" << be_idt; - + if (!node->void_return_type ()) { be_type *t = be_type::narrow_from_decl (node->return_type ()); - + os_ << be_nl << "in " << IdentifierHelper::type_name (t, this) << " ami_return_val"; } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl") ACE_TEXT ("::visit_operation - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << ");" << be_uidt; - + os_ << be_nl << "void " << node->original_local_name () << "_excep (" << be_idt_nl << "in ::CCM_AMI::ExceptionHolder excep_holder);" << be_uidt; - - /// Reset for next operation traversal. + + /// Reset for next operation traversal. this->seen_in_or_inout_arg_ = false; - + return 0; } @@ -141,12 +141,12 @@ int be_visitor_ami4ccm_rh_ex_idl::visit_attribute (be_attribute *node) { this->gen_attr_rh_ops (false, node); - + if (!node->readonly ()) { this->gen_attr_rh_ops (true, node); } - + return 0; } @@ -157,17 +157,17 @@ be_visitor_ami4ccm_rh_ex_idl::visit_argument (be_argument *node) { return 0; } - + be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); - + os_ << " " << node->original_local_name (); - + return 0; } @@ -208,21 +208,21 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) { be_operation *op = be_operation::narrow_from_scope (this->ctx_->scope ()); - + if (op == 0) { return 0; } - + bool void_ret_type = op->void_return_type (); - + be_argument *arg = be_argument::narrow_from_decl (node); - + if (arg == 0) { return 0; } - + if (arg->direction () == AST_Argument::dir_IN) { return 0; @@ -231,7 +231,7 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) if (!this->seen_in_or_inout_arg_) { this->seen_in_or_inout_arg_ = true; - + if (void_ret_type) { /// If we are here, we are generating the first @@ -240,11 +240,11 @@ be_visitor_ami4ccm_rh_ex_idl::pre_process (be_decl *node) return 0; } } - + /// If we are here after all the above checks, we - /// always want to generate a leading comma. + /// always want to generate a leading comma. os_ << ","; - + return 0; } @@ -255,19 +255,19 @@ be_visitor_ami4ccm_rh_ex_idl::gen_attr_rh_ops (bool is_set_op, os_ << be_nl << "void " << (is_set_op ? "set_" : "get_") << node->original_local_name () << " ("; - + if (!is_set_op) { be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_idt_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); - + os_ << " " << node->original_local_name () << be_uidt; } - + os_ << ");" << be_nl << "void " << (is_set_op ? "set_" : "get_") diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp index e4f4f3df1ad..7e4f1e347c0 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami4ccm_sendc_ex_idl.cpp @@ -36,36 +36,36 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_interface (be_interface *node) << "local interface AMI4CCM_" << node->original_local_name () << be_nl << "{" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl") ACE_TEXT ("::visit_interface - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + AST_Interface **inh_flat = node->inherits_flat (); - + for (long i = 0; i < node->n_inherits_flat (); ++i) { be_interface *ancestor = be_interface::narrow_from_decl (inh_flat[i]); - + if (this->visit_scope (ancestor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_sendc_ex_idl") ACE_TEXT ("::visit_interface - visit ") ACE_TEXT ("ancestor scope failed\n")), - -1); + -1); } } - + os_ << be_uidt_nl << "};"; - + return 0; } @@ -77,7 +77,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node) // We do nothing for oneways! return 0; } - + if (!node->is_sendc_ami ()) { return 0; @@ -86,17 +86,17 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_operation (be_operation *node) os_ << be_nl << "void " << node->original_local_name () << " (" << be_idt; - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_ami4ccm_rh_ex_idl::visit_operation - ") ACE_TEXT ("visit_scope() failed\n")), - -1); + -1); } - + os_ << ");" << be_uidt; - + return 0; } @@ -107,7 +107,7 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node) { return 0; } - + /// AMI4CCM uses a different reply handler type, so we just /// replace the original handler parameter (which is always the /// first one) type. @@ -121,15 +121,15 @@ be_visitor_ami4ccm_sendc_ex_idl::visit_argument (be_argument *node) { be_type *t = be_type::narrow_from_decl (node->field_type ()); - + os_ << be_nl << "in "; - + os_ << IdentifierHelper::type_name (t, this); } - + os_ << " " << node->original_local_name (); - + return 0; } @@ -169,24 +169,24 @@ int be_visitor_ami4ccm_sendc_ex_idl::pre_process (be_decl *node) { be_argument *arg = be_argument::narrow_from_decl (node); - + if (arg == 0) { return 0; } - + if (arg->direction () != AST_Argument::dir_IN) { return 0; } - + if (this->elem_number () == 1) { return 0; } os_ << ","; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp index 6e4f9c76cf5..fad0e3eb4f4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp @@ -41,10 +41,10 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) const char *macro = this->ctx_->export_macro (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; be_module *module = 0; @@ -96,7 +96,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp index f7d0caed56e..c8c3026b2f3 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp @@ -42,10 +42,10 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl; *os << be_global->core_versioning_begin () << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp index 22d00a2ae0f..5c1ab004d63 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp @@ -62,7 +62,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node) << "const " << node->full_name () << "_ptr _tao_objref)" << be_uidt << be_uidt_nl << "{" << be_idt_nl; - + AST_Decl::NodeType nt = node->node_type (); if (node->is_abstract ()) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index 99b73167f7f..2881de3760a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -406,7 +406,7 @@ be_visitor_interface::visit_operation (be_operation *node) } case TAO_CodeGen::TAO_ROOT_CS: ctx.state (TAO_CodeGen::TAO_OPERATION_CS); - + if (node->is_sendc_ami ()) { be_visitor_operation_ami_cs visitor (&ctx); @@ -417,7 +417,7 @@ be_visitor_interface::visit_operation (be_operation *node) be_visitor_operation_cs visitor (&ctx); status = node->accept (&visitor); } - + break; case TAO_CodeGen::TAO_ROOT_SH: { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index e4cc2609d0a..818a49ef5fa 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -73,7 +73,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index e3e186606f3..949566c1530 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -92,10 +92,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // Find if we are at the top scope or inside some module, @@ -165,10 +165,10 @@ be_visitor_interface_ss::visit_interface (be_interface *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // Generate code for the _is_a skeleton. @@ -520,7 +520,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) && !be_global->gen_minimum_corba ()) { *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -879,10 +879,10 @@ be_visitor_interface_ss::this_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; // The _this () operation. @@ -961,10 +961,10 @@ be_visitor_interface_ss::dispatch_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; *os << "void " << node->full_skel_name () @@ -1024,7 +1024,7 @@ be_visitor_interface_ss::generate_proxy_classes (be_interface *node) || be_global->gen_thru_poa_collocation ()) { *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp index 431cc2f0159..eef8deab7ab 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp @@ -35,13 +35,13 @@ be_visitor_interface_svh::visit_interface (be_interface *node) { return 0; } - - // Skip implied IDL nodes. + + // Skip implied IDL nodes. if (node->original_interface () != 0) { return 0; } - + if (node->is_local () || node->imported () || node->is_abstract ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp index cfdfe89ec39..d493009484a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp @@ -35,13 +35,13 @@ be_visitor_interface_svs::visit_interface (be_interface *node) { return 0; } - - // Skip implied IDL nodes. + + // Skip implied IDL nodes. if (node->original_interface () != 0) { return 0; } - + if (node->is_local () || node->imported () || node->is_abstract ()) { return 0; @@ -56,7 +56,7 @@ be_visitor_interface_svs::visit_operation (be_operation *node) be_visitor_operation_svs v (this->ctx_); v.scope (be_interface::narrow_from_decl ( this->ctx_->scope ()->decl ())); - + return v.visit_operation (node); } @@ -64,11 +64,11 @@ int be_visitor_interface_svs::visit_attribute (be_attribute *node) { be_visitor_attribute v (this->ctx_); - + v.for_facets (true); v.op_scope (be_interface::narrow_from_decl ( this->ctx_->scope ()->decl ())); - + return v.visit_attribute (node); } diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp index ec4a3c01a27..257448e0622 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp @@ -95,7 +95,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void" << " operator<<= (::CORBA::Any &, " << node->name () << "_ptr); // copying" << be_nl; @@ -107,7 +107,7 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd ( << node->name () << " *&);"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp index 9a250cebe6d..3ff4f512f52 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp @@ -55,7 +55,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean " << "operator<< (TAO_OutputCDR &, const " << node->full_name () << "_ptr );" << be_nl; @@ -64,7 +64,7 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node) << node->full_name () << "_ptr &);\n"; *os << be_global->core_versioning_end () << be_nl; - + node->cli_hdr_cdr_op_gen (1); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp index aaf05f86ec7..639e9b080ab 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp @@ -35,7 +35,7 @@ be_visitor_module_any_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp index 64bacbcde9d..53fe04bc832 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp @@ -35,7 +35,7 @@ be_visitor_module_cdr_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_cdr_op::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp index 8a3f05abf91..66c7410f458 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp @@ -708,8 +708,8 @@ be_visitor_module::visit_component (be_component *node) case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return this->visit_interface (node); - - // Nothing for these with components. + + // Nothing for these with components. case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH: case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS: case TAO_CodeGen::TAO_ROOT_IH: @@ -885,7 +885,7 @@ be_visitor_module::visit_connector (be_connector *node) case TAO_CodeGen::TAO_ROOT_CNH: { if (node->dds_connector ()) - { + { be_visitor_connector_dds_exh visitor (&ctx); status = node->accept (&visitor); break; @@ -900,7 +900,7 @@ be_visitor_module::visit_connector (be_connector *node) case TAO_CodeGen::TAO_ROOT_CNS: { if (node->dds_connector ()) - { + { be_visitor_connector_dds_exs visitor (&ctx); status = node->accept (&visitor); break; @@ -922,7 +922,7 @@ be_visitor_module::visit_connector (be_connector *node) // In all other cases, same as component. return this->visit_component (node); } - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -931,7 +931,7 @@ be_visitor_module::visit_connector (be_connector *node) ACE_TEXT ("failed to accept visitor\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp index 0e70e377f49..139890224ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp @@ -36,7 +36,7 @@ be_visitor_module_ih::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_ih::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 648a9d77167..eb8781f541b 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -64,7 +64,7 @@ be_visitor_module_sh::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_sh::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp index cae4ec74c42..b1b3fada0fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for the TAO::DCPS::Serializer operators + * Visitor generating code for the TAO::DCPS::Serializer operators * for types defined in Module's scope. * * @@ -35,7 +35,7 @@ be_visitor_module_serializer_op::visit_module (be_module *node) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_module_serializer_op::visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp index 9e774b8c4dd..661c5084a4d 100644 --- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp @@ -47,7 +47,7 @@ be_visitor_native_ch::visit_native (be_native *node) << be_nl << be_nl; const char *node_name = node->full_name (); - + if (ACE_OS::strcmp (node_name, "PortableServer::ServantLocator::Cookie") == 0) { *os << "typedef void *Cookie;" << be_nl; @@ -75,12 +75,12 @@ be_visitor_native_ch::visit_native (be_native *node) // strip the "Seq" ending to get the sample's name const size_t max_name_length = 2000; - + if (ACE_OS::strlen (node_name) >= max_name_length) { return -1; } - + char sample_name[max_name_length]; ACE_OS::strncpy (sample_name, node_name, diff --git a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp index cf1ca9606e1..7b56d23ce99 100644 --- a/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp +++ b/TAO/TAO_IDL/be/be_visitor_null_return_value.cpp @@ -33,7 +33,7 @@ int be_visitor_null_return_value::visit_array (be_array *) { os_ << "0"; - + return 0; } @@ -115,7 +115,7 @@ be_visitor_null_return_value::visit_predefined_type (be_predefined_type *node) default: // PT_void not handled. break; } - + return 0; } @@ -123,7 +123,7 @@ int be_visitor_null_return_value::visit_sequence (be_sequence *) { os_ << "0"; - + return 0; } @@ -131,7 +131,7 @@ int be_visitor_null_return_value::visit_string (be_string *) { os_ << "0"; - + return 0; } @@ -146,7 +146,7 @@ be_visitor_null_return_value::visit_structure (be_structure *node) { os_ << "0"; } - + return 0; } @@ -167,7 +167,7 @@ be_visitor_null_return_value::visit_union (be_union *node) { os_ << "0"; } - + return 0; } @@ -175,7 +175,7 @@ int be_visitor_null_return_value::visit_valuebox (be_valuebox *) { os_ << "0"; - + return 0; } @@ -183,7 +183,7 @@ int be_visitor_null_return_value::visit_valuetype (be_valuetype *) { os_ << "0"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp index 9d1e5760977..e2eb29ee6b3 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp @@ -37,7 +37,7 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; @@ -51,13 +51,13 @@ be_visitor_amh_rh_operation_sh::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp index 98cd49868d3..6f9be7a1cc5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp @@ -30,7 +30,7 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; @@ -43,13 +43,13 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index 29b675f53ae..3cb11413d12 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -36,8 +36,8 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node) { return 0; } - - /// These are not for the server side. + + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index d8b7930f3b8..25b4d1c3838 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -31,7 +31,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) return 0; } - /// These are not for the server side. + /// These are not for the server side. if (node->is_sendc_ami ()) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index 88b97927506..1b0ae066275 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -195,15 +195,15 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) be_interface *intf = be_interface::narrow_from_decl (parent); ACE_CString base (node->local_name ()->get_string ()); - + /// The sendc_* operation makes the invocation with the /// original operation name. ACE_CString lname_str (base.substr (ACE_OS::strlen ("sendc_"))); const char *lname = lname_str.c_str (); - + ACE_CString opname (node->is_attr_op () ? "_" : ""); opname += lname; - + /// Some compilers can't resolve the stream operator overload. const char *op_name = opname.c_str (); ACE_CDR::ULong len = opname.length (); @@ -227,7 +227,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << be_uidt_nl << ");" << be_uidt; - + *os << be_nl << be_nl << "_tao_call.invoke (" << be_idt << be_idt_nl << "ami_handler," << be_nl @@ -240,7 +240,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) *os << gparent->name () << "::"; } - + *os << "AMI_" << parent->local_name () << "Handler::" << lname << "_reply_stub" << be_uidt_nl << ");" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index 5e28e5365ed..e9014ad1c17 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -275,7 +275,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument ( os->indent (); *os << "{" << bt->tc_name () << ", "; - + switch (node->direction ()) { case AST_Argument::dir_IN: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp index 207e0f6862a..a6d4d0ac176 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp @@ -37,7 +37,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) bool has_args = node->argument_count () > 0; *os << " ("; - + if (has_args) { *os << be_idt_nl; @@ -74,7 +74,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node) } *os << ")"; - + if (has_args) { *os << be_uidt; @@ -112,7 +112,7 @@ be_visitor_operation_arglist::visit_factory (be_factory *node) bool has_args = node->argument_count () > 0; *os << " ("; - + if (has_args) { *os << be_idt_nl; @@ -134,12 +134,12 @@ be_visitor_operation_arglist::visit_factory (be_factory *node) } *os << ")"; - + if (has_args) { *os << be_uidt; } - + // At present, visit_factory() is called only from the home // servant source visitor, so we don't need to check the state // for semicolon generation. @@ -169,7 +169,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) { be_factory *f = be_factory::narrow_from_scope (this->ctx_->scope ()); - + intf = be_interface::narrow_from_scope (f->defined_in ()); } else @@ -178,7 +178,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node) ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) : be_interface::narrow_from_scope (op->defined_in ()); } - + // Set new scope. ctx.scope (intf); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp index b0ff9d80ba5..7de506bd3b0 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp @@ -109,7 +109,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_OUTPUT: @@ -156,7 +156,7 @@ be_visitor_operation_argument_invoke::post_process (be_decl *bd) "Bad sub state\n"), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp index b349e15e088..3a399e5a071 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp @@ -49,7 +49,7 @@ be_visitor_operation_argument_marshal::pre_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (arg->direction ()) { case AST_Argument::dir_IN: @@ -109,7 +109,7 @@ be_visitor_operation_argument_marshal::post_process (be_decl *bd) "Bad argument node\n"), -1); } - + switch (this->ctx_->sub_state ()) { case TAO_CodeGen::TAO_CDR_INPUT: @@ -199,7 +199,7 @@ be_visitor_args_decl::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_args_decl::" "visit_array - " - "cannot retrieve argument node\n"), + "cannot retrieve argument node\n"), -1); } @@ -207,8 +207,8 @@ be_visitor_args_decl::visit_array (be_array *node) // the full_name with or without the underscore and use it later on. char fname [NAMEBUFSIZE]; // to hold the full and - ACE_OS::memset (fname, - '\0', + ACE_OS::memset (fname, + '\0', NAMEBUFSIZE); if (!this->ctx_->alias () // not a typedef @@ -224,23 +224,23 @@ be_visitor_args_decl::visit_array (be_array *node) be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl (); - ACE_OS::sprintf (fname, - "%s::_%s", + ACE_OS::sprintf (fname, + "%s::_%s", parent->full_name (), node->local_name ()->get_string ()); } else { - ACE_OS::sprintf (fname, - "_%s", + ACE_OS::sprintf (fname, + "_%s", node->full_name ()); } } else { // Typedefed node. - ACE_OS::sprintf (fname, - "%s", + ACE_OS::sprintf (fname, + "%s", node->full_name ()); } @@ -272,7 +272,7 @@ be_visitor_args_decl::visit_typedef (be_typedef *node) "(%N:%l) be_visitor_args_decl::" "visit_typedef - " "Bad primitive type\n" - ), + ), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp index fba6f0e5bd4..0441d4bd023 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp @@ -21,7 +21,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); // We need the interface node in which this operation was defined. However, @@ -31,13 +31,13 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation ( this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 48f13b135ce..06cf8a8faaa 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -140,13 +140,13 @@ be_visitor_operation::gen_stub_operation_body ( this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -195,7 +195,7 @@ be_visitor_operation::gen_stub_operation_body ( << "::CORBA::Object::tao_object_initialize (this);" << be_uidt_nl << "}" << be_uidt_nl << be_nl; - + if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ()) { *os << "if (this->the" << intf->base_proxy_broker_name () << "_ == 0)" @@ -283,11 +283,11 @@ be_visitor_operation::gen_stub_operation_body ( } opname += node->original_local_name ()->get_string (); - + /// Some compilers can't resolve the stream operator overload. const char *lname = opname.c_str (); ACE_CDR::ULong len = opname.length (); - + *os << lname << "\"," << be_nl << len << "," << be_nl; @@ -537,13 +537,13 @@ be_visitor_operation::gen_arg_template_param_name (AST_Decl *scope, // without the leading double colon. *os << "::"; } - + /// For now, keep a list of system operation or arg names /// that may not be remapped. May decide later to regnerate - /// ORB code for alt mapping as well. + /// ORB code for alt mapping as well. ACE_CString repo_id (scope->repoID ()); bool sys_val = (repo_id == "IDL:repository_id:1.0"); - + // For types other than the 4 above, don't unalias the type name // in case it is a sequence or array. if (nt == AST_Decl::NT_string && bound == 0) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp index 4aa05cef6b7..5258b04e727 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp @@ -50,7 +50,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node) ACE_TEXT ("Bad return type\n")), -1); } - + // Grab the right visitor to generate the return type. be_visitor_context ctx (*this->ctx_); be_visitor_operation_rettype or_visitor (&ctx); @@ -83,13 +83,13 @@ be_visitor_operation_ch::visit_operation (be_operation *node) "codegen for argument list failed\n"), -1); } - + be_interface *intf = be_interface::narrow_from_scope (node->defined_in ()); - + /// If we are in a reply handler, are not an execp_* operation, /// and have no native args, then generate the AMI static - /// reply stub declaration. + /// reply stub declaration. if (intf != 0 && intf->is_ami_rh () && !node->is_excep_ami () diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 80f9ae985af..1d333391270 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -47,13 +47,13 @@ be_visitor_operation_cs::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -103,7 +103,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) "codegen for return type failed\n"), -1); } - + // Generate the operation name *os << be_nl << intf->name () << "::" << node->local_name (); @@ -130,10 +130,10 @@ be_visitor_operation_cs::visit_operation (be_operation *node) "codegen for stub body failed\n"), -1); } - + /// If we are in a reply handler, are not an execp_* operation, /// and have no native args, then generate the AMI static - /// reply stub declaration. + /// reply stub declaration. if (intf != 0 && intf->is_ami_rh () && !node->is_excep_ami () @@ -141,9 +141,9 @@ be_visitor_operation_cs::visit_operation (be_operation *node) { be_visitor_operation_ami_handler_reply_stub_operation_cs v ( this->ctx_); - + int status = v.visit_operation (node); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -153,7 +153,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) -1); } } - + return 0; } @@ -191,6 +191,6 @@ be_visitor_operation_cs::visit_argument (be_argument *node) } *os << "0}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp index 8b3ab313083..2229c61d5c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp @@ -37,7 +37,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node) this->ctx_->node (node); os_ << be_nl << be_nl; - + // Retrieve the operation return type. be_type *rt = be_type::narrow_from_decl (node->return_type ()); @@ -70,8 +70,8 @@ be_visitor_operation_exs::visit_operation (be_operation *node) << scope_->original_local_name ()->get_string () << this->class_extension_.c_str () << "::" << node->local_name (); - - // Generate the argument list, which will use our overrridden + + // Generate the argument list, which will use our overrridden // visit_argument(). be_visitor_operation_arglist al_visitor (this->ctx_); al_visitor.unused (true); @@ -88,7 +88,7 @@ be_visitor_operation_exs::visit_operation (be_operation *node) // Must set this again, it's been changed by traversals above. this->ctx_->node (node); - + return this->gen_op_body (rt); } @@ -110,16 +110,16 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type) os_ << be_nl << "{" << be_idt_nl << your_code_here_; - + be_operation *op = be_operation::narrow_from_decl (this->ctx_->node ()); - + if (! op->void_return_type ()) { os_ << be_nl; - + be_null_return_emitter emitter (this->ctx_); - + if (emitter.emit (return_type) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -130,10 +130,10 @@ be_visitor_operation_exs::gen_op_body (be_type *return_type) -1); } } - + os_ << be_uidt_nl << "}"; - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp index 1e1a89544e9..aa741c77706 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp @@ -36,7 +36,7 @@ be_visitor_operation_ih::visit_operation (be_operation *node) TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); - + *os << be_nl << be_nl; if (be_global->gen_impl_debug_info ()) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index faf04367558..4cf1e975792 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -33,7 +33,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 5933502c8ef..bcb02b81a7c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -33,7 +33,7 @@ be_visitor_operation_ss::visit_operation (be_operation * node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); be_type *bt = 0; @@ -131,9 +131,9 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, UTL_Scope *s = this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); - + if (intf == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp index f23dbd3eb1b..d97d5f04ee5 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp @@ -19,7 +19,7 @@ int be_visitor_operation_proxy_impl_xh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index 5b607d1214f..323474b95be 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -133,7 +133,7 @@ be_visitor_operation_rettype::visit_sequence ( be_sequence *node) { *os << "::" << this->type_name (node); - + if (!be_global->alt_mapping () || !node->unbounded ()) { *os << " *"; @@ -147,7 +147,7 @@ be_visitor_operation_rettype::visit_string (be_string *node) { ACE_CDR::ULong bound = node->max_size ()->ev ()->u.ulval; bool wide = (node->width () != (long) sizeof (char)); - + if (wide) { *os << "::CORBA::WChar *"; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp index fff9050a710..9c012f6efc7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp @@ -208,7 +208,7 @@ be_visitor_operation_rettype_return_cs::visit_union ( { *os << "_tao_retval"; } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp index e5a1973d1b6..37efa14f16b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp @@ -42,13 +42,13 @@ int be_visitor_operation_smart_proxy_cs::visit_operation (be_operation *node) this->ctx_->attribute () ? this->ctx_->attribute ()->defined_in () : node->defined_in (); - + be_interface *intf = be_interface::narrow_from_scope (s); if (intf == 0) { be_porttype *pt = be_porttype::narrow_from_scope (s); - + if (pt == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp index 33c2f374789..3c0d92de45a 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp @@ -37,7 +37,7 @@ be_visitor_operation_tie_sh::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); this->ctx_->node (node); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp index a4e93c33c3e..7eb1d69fc16 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp @@ -35,7 +35,7 @@ int be_visitor_operation_tie_ss::visit_operation (be_operation *node) { return 0; } - + TAO_OutStream *os = this->ctx_->stream (); be_interface *intf = this->ctx_->interface (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 874ba46a403..aa891246704 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -34,7 +34,7 @@ be_visitor_operation_upcall_command_ss::visit ( { return 0; } - + be_interface * const intf = this->ctx_->attribute () ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ()) : be_interface::narrow_from_scope (node->defined_in ()); @@ -71,7 +71,7 @@ be_visitor_operation_upcall_command_ss::visit ( be_util::gen_nested_namespace_begin (&os, module, true); } - + be_visitor_context ctx (*this->ctx_); // save the node. @@ -225,7 +225,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( bool excep_method = ((ACE_OS::strstr (op_name, excep_suffix) + excep_suffix_len) == (op_name + ACE_OS::strlen (op_name))); - + for (; !si.is_done (); si.next (), ++index) { AST_Argument * const arg = @@ -348,7 +348,7 @@ be_visitor_operation_upcall_command_ss::gen_upcall ( exceplist.visit_operation (node); unsigned int exceptions_count = 0; - + for (UTL_ExceptlistActiveIterator ei (node->exceptions ()); !ei.is_done (); ei.next ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp index 18443c5f93a..54b14ed1c47 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp @@ -31,17 +31,17 @@ int be_visitor_root_any_op::visit_root (be_root *node) { if (be_global->gen_anyop_files ()) - { + { // Switch streams, ctx will be reassigned when this // pass is done. switch (this->ctx_->state ()) { case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: this->ctx_->stream (tao_cg->anyop_header ()); - break; + break; case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: this->ctx_->stream (tao_cg->anyop_source ()); - break; + break; default: break; } @@ -51,9 +51,9 @@ be_visitor_root_any_op::visit_root (be_root *node) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root::visit_root - ") - ACE_TEXT ("codegen for scope failed\n")), + ACE_TEXT ("codegen for scope failed\n")), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp index e20bdbdf021..5df9e4d564f 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp @@ -35,7 +35,7 @@ be_visitor_root_cdr_op::visit_root (be_root *node) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root_cdr_op::") ACE_TEXT ("visit_root - codegen ") - ACE_TEXT ("for scope failed\n")), + ACE_TEXT ("for scope failed\n")), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp index 108787d3106..208d88336fb 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp @@ -36,7 +36,7 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + this->gen_fwd_decls (); if (this->visit_scope (node) == -1) @@ -46,11 +46,11 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("codegen for scope failed\n")), -1); } - + this->gen_proxy_broker_factory_pointers (); - + this->gen_ref_counting_overrides (); - + this->gen_static_corba_overrides (); if (this->gen_obv_decls (node) == -1) @@ -80,7 +80,7 @@ be_visitor_root_ch::visit_root (be_root *node) ACE_TEXT ("failed to export templates\n")), -1); } - + if (this->gen_any_ops (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -122,7 +122,7 @@ be_visitor_root_ch::init (void) int status = tao_cg->start_client_header ( be_global->be_get_client_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -133,9 +133,9 @@ be_visitor_root_ch::init (void) /// Initialize the stream. this->ctx_->stream (tao_cg->client_header ()); - + this->o_ = this->ctx_->stream (); - + return 0; } @@ -177,15 +177,15 @@ void be_visitor_root_ch::gen_proxy_broker_factory_pointers (void) { size_t size = be_global->non_local_interfaces.size (); - + if (size == 0) { return; } - + size_t index = 0; be_interface *i = 0; - + *o_ << be_nl << be_nl << "// Proxy Broker Factory function pointer declarations." << be_nl << be_nl @@ -214,12 +214,12 @@ void be_visitor_root_ch::gen_ref_counting_overrides (void) { size_t size = be_global->non_defined_interfaces.size (); - + if (size == 0) { return; } - + size_t index = 0; be_interface_fwd *ifwd = 0; @@ -260,12 +260,12 @@ void be_visitor_root_ch::gen_static_corba_overrides (void) { size_t size = idl_global->mixed_parentage_interfaces ().size (); - + if (size == 0) { return; } - + size_t index = 0; AST_Interface *i = 0; @@ -327,8 +327,8 @@ be_visitor_root_ch::gen_template_exports (be_root *node) { return 0; } - - be_visitor_context ctx = *this->ctx_; + + be_visitor_context ctx = *this->ctx_; be_visitor_template_export export_visitor (&ctx); return node->accept (&export_visitor); } @@ -372,7 +372,7 @@ be_visitor_root_ch::gen_dds_serializer_ops (be_root *node) { return 0; } - + be_visitor_context ctx = *this->ctx_; ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CH); be_visitor_root_cdr_op visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp index 540759a7ad3..017c73ec855 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp @@ -36,7 +36,7 @@ be_visitor_root_cnh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -46,9 +46,9 @@ be_visitor_root_cnh::visit_root (be_root *node) } (void) tao_cg->end_ciao_conn_header (); - + TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_header (); - + /// If this stream has been created during the connector AST /// pass we generate the file ending stuff here, to make sure /// that all the AST nodes have been traversed. @@ -56,7 +56,7 @@ be_visitor_root_cnh::visit_root (be_root *node) { (void) tao_cg->end_ciao_ami_rh_impl_header (); } - + return 0; } @@ -67,7 +67,7 @@ be_visitor_root_cnh::init (void) int status = tao_cg->start_ciao_conn_header ( be_global->be_get_ciao_conn_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp index 5da09f03cad..9995a73c7c8 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp @@ -36,7 +36,7 @@ be_visitor_root_cns::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -48,7 +48,7 @@ be_visitor_root_cns::visit_root (be_root *node) (void) tao_cg->end_ciao_conn_source (); TAO_OutStream *rh_impl = tao_cg->ciao_ami_rh_impl_source (); - + /// If this stream has been created during the connector AST /// pass we generate the file ending stuff here, to make sure /// that all the AST nodes have been traversed. @@ -56,7 +56,7 @@ be_visitor_root_cns::visit_root (be_root *node) { (void) tao_cg->end_ciao_ami_rh_impl_source (); } - + return 0; } @@ -67,7 +67,7 @@ be_visitor_root_cns::init (void) int status = tao_cg->start_ciao_conn_source ( be_global->be_get_ciao_conn_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp index 14ddf78de94..823d0aa39cf 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp @@ -35,7 +35,7 @@ be_visitor_root_cs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->gen_arg_traits (node) == -1) { @@ -106,7 +106,7 @@ be_visitor_root_cs::init (void) int status = tao_cg->start_client_stubs ( be_global->be_get_client_stub_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -156,7 +156,7 @@ be_visitor_root_cs::gen_any_ops (be_root *node) { (void) tao_cg->end_anyop_source (); } - + return status; } @@ -176,7 +176,7 @@ be_visitor_root_cs::gen_dds_serializer_ops (be_root *node) { return 0; } - + be_visitor_context ctx = *this->ctx_; ctx.state (TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS); be_visitor_root_cdr_op visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp index 14dbb784521..97b066e0151 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp @@ -36,7 +36,7 @@ be_visitor_root_ex_idl::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp index 2d464d829b7..02afa1a3949 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp @@ -36,7 +36,7 @@ be_visitor_root_exh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_exh::init (void) int status = tao_cg->start_ciao_exec_header ( be_global->be_get_ciao_exec_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp index a2f4717080d..16d9d5f9c7a 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp @@ -36,7 +36,7 @@ be_visitor_root_exs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_exs::init (void) int status = tao_cg->start_ciao_exec_source ( be_global->be_get_ciao_exec_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp index 85d6656bdfd..472b0c9b107 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp @@ -35,7 +35,7 @@ be_visitor_root_ih::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -57,7 +57,7 @@ be_visitor_root_ih::init (void) int status = tao_cg->start_implementation_header ( be_global->be_get_implementation_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp index 5fa99b5b944..5e9389004b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp @@ -34,7 +34,7 @@ be_visitor_root_is::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -53,7 +53,7 @@ be_visitor_root_is::init (void) int status = tao_cg->start_implementation_skeleton ( be_global->be_get_implementation_skel_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp index b40ce5c36e6..44b6aba4236 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp @@ -35,7 +35,7 @@ be_visitor_root_sh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + /// The SI and SS cases are caught in BE_produce(). We /// want to generate an empty skeleton header file, which /// has been done, so -SS can flag a skip of the scope @@ -64,7 +64,7 @@ be_visitor_root_sh::init (void) int status = tao_cg->start_server_header ( be_global->be_get_server_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp index e78bc2a685a..35b082bc11b 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp @@ -35,7 +35,7 @@ be_visitor_root_si::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ be_visitor_root_si::init (void) int status = tao_cg->start_server_inline ( be_global->be_get_server_inline_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp index f6e851a7bcc..b754b1d52a9 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp @@ -35,13 +35,13 @@ be_visitor_root_ss::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->gen_arg_traits (node) == -1) { /// Error message already output. return -1; } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -67,7 +67,7 @@ be_visitor_root_ss::init (void) int status = tao_cg->start_server_skeletons ( be_global->be_get_server_skeleton_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -81,7 +81,7 @@ be_visitor_root_ss::init (void) status = tao_cg->start_server_template_skeletons ( be_global->be_get_server_template_skeleton_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -129,7 +129,7 @@ be_visitor_root_ss::gen_arg_traits (be_root *node) -1); } } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp index fe3cc3cabc9..f97e6c7fda9 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp @@ -32,7 +32,7 @@ be_visitor_root_sth::visit_root (be_root *node) { return 0; } - + if (this->init () == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -40,7 +40,7 @@ be_visitor_root_sth::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -138,7 +138,7 @@ be_visitor_root_sth::init (void) int status = tao_cg->start_server_template_header ( be_global->be_get_server_template_hdr_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp index 02e07ace652..09e31cd29b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp @@ -35,7 +35,7 @@ be_visitor_root_svh::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp index 35f6d6c640d..d81469299ac 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp @@ -35,7 +35,7 @@ be_visitor_root_svs::visit_root (be_root *node) ACE_TEXT ("failed to initialize\n")), -1); } - + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -56,7 +56,7 @@ be_visitor_root_svs::init (void) int status = tao_cg->start_ciao_svnt_source ( be_global->be_get_ciao_svnt_src_fname ()); - + if (status == -1) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp index c0ae070ab2b..f595a2c028d 100644 --- a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for the TAO::DCPS::Serializer operators + * Visitor generating code for the TAO::DCPS::Serializer operators * for types defined in Root's scope. * * @@ -35,7 +35,7 @@ be_visitor_root_serializer_op::visit_root (be_root *node) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("be_visitor_root_serializer_op::") ACE_TEXT ("visit_root - codegen ") - ACE_TEXT ("for scope failed\n")), + ACE_TEXT ("for scope failed\n")), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp index bb24050fea4..49022a2f806 100644 --- a/TAO/TAO_IDL/be/be_visitor_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp @@ -64,7 +64,7 @@ be_visitor_scope::visit_scope (be_scope *node) "bad node in this scope\n"), -1); } - + be_decl *bd = be_decl::narrow_from_decl (d); // Set the scope node as "node" in which the code is being diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp index 4efb8c70596..b5bcab811eb 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp @@ -42,21 +42,21 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) const char *macro = this->ctx_->export_macro (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; - + *os << be_nl << be_nl; ACE_CString name; - + bool alt = be_global->alt_mapping (); - + if (alt) { be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + name = "std::vector<"; name += bt->full_name (); name += ">"; @@ -66,7 +66,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) name = node->full_name (); } - be_module *module = 0; + be_module *module = 0; if (node->is_nested ()) { AST_Decl *d = node; @@ -91,7 +91,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); // Generate the Any <<= and >>= operators. @@ -100,22 +100,22 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) << " operator<<= ( ::CORBA::Any &, const ::" << name.c_str () << " &); // copying version" << be_nl; - + if (!alt) - { + { *os << macro << " void" << " operator<<= ( ::CORBA::Any &, ::" << name.c_str () << "*); // noncopying version" << be_nl; - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, ::" << name.c_str () << " *&); // deprecated" << be_nl; } - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, const ::" @@ -123,7 +123,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) << " *&);"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -131,29 +131,29 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) } *os << be_global->core_versioning_begin () << be_nl; - + // Generate the Any <<= and >>= operators. *os << macro << " void" << " operator<<= ( ::CORBA::Any &, const " << name.c_str () << " &); // copying version" << be_nl; - + if (!alt) - { + { *os << macro << " void" << " operator<<= ( ::CORBA::Any &, " << name.c_str () << "*); // noncopying version" << be_nl; - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " << name.c_str () << " *&); // deprecated" << be_nl; } - + *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, const " @@ -167,7 +167,7 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node) *os << "\n\n#endif"; } - + node->cli_hdr_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp index ead93407e9b..4627f354e69 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp @@ -46,28 +46,28 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // These are no-ops for now, so we just generate them and return if (be_global->alt_mapping () && node->max_size ()->ev ()->u.ulval == 0) { be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + if (bt->node_type () == AST_Decl::NT_typedef) { be_typedef *td = be_typedef::narrow_from_decl (bt); bt = td->primitive_base_type (); } - + enum type_category { ANY_VALUE, ANY_OBJREF, ANY_ARRAY }; - + type_category tc = ANY_VALUE; - + if (bt->node_type () == AST_Decl::NT_array) { tc = ANY_ARRAY; @@ -77,7 +77,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) { tc = ANY_OBJREF; } - + *os << be_nl << "void operator<<= (" << be_idt_nl << "::CORBA::Any &_tao_any," << be_nl @@ -85,31 +85,31 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "> &_tao_elem)" << be_uidt_nl << "{" << be_idt_nl << "TAO::"; - + switch (tc) { case ANY_OBJREF: *os << "insert_objref_vector<" << bt->full_name () << "_ptr> ("; - + break; case ANY_ARRAY: *os << "insert_array_vector<" << bt->full_name () << "_forany> ("; - + break; default: *os << "insert_value_vector<" << bt->full_name () << "> ("; - + break; } - + *os << be_idt_nl << "_tao_any," << be_nl << "_tao_elem);" << be_uidt << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "::CORBA::Boolean operator>>= (" << be_idt_nl << "const ::CORBA::Any &_tao_any," << be_nl @@ -118,38 +118,38 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "return" << be_idt_nl << "TAO::"; - + switch (tc) { case ANY_OBJREF: *os << "extract_objref_vector<" << bt->full_name () << "_ptr> ("; - + break; case ANY_ARRAY: *os << "extract_array_vector<" << bt->full_name () << "_forany> ("; - + break; default: *os << "extract_value_vector<" << bt->full_name () << "> ("; - + break; } - + *os << be_idt_nl << "_tao_any," << be_nl << "_tao_elem);" << be_uidt << be_uidt << be_uidt_nl << "}"; - + *os << be_nl << be_global->core_versioning_end () << be_nl; - + node->cli_stub_any_op_gen (true); return 0; } - + // Since we don't generate CDR stream operators for types that // explicitly contain a local interface (at some level), we // must override these Any template class methods to avoid @@ -178,14 +178,14 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "}" << be_uidt_nl << "}" << be_nl; } - + *os << be_global->core_versioning_end () << be_nl; // If this is non-zero, we want to call its tc_name() - // for the TypeCode to pass to the Any operator impls. + // for the TypeCode to pass to the Any operator impls. be_typedef *td = this->ctx_->tdef (); - be_module *module = 0; + be_module *module = 0; if (node->is_nested ()) { AST_Decl *d = node; @@ -210,9 +210,9 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + // Copying insertion. *os << be_nl << "// Copying insertion." << be_nl @@ -284,7 +284,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) << "}"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -292,7 +292,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) } *os << be_global->core_versioning_begin () << be_nl; - + // Copying insertion. *os << be_nl << "// Copying insertion." << be_nl @@ -369,7 +369,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node) { *os << "\n\n#endif"; } - + node->cli_stub_any_op_gen (true); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp index e09eecb2157..ff6560f9df0 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp @@ -68,7 +68,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) << node->flat_name () << "_H_" << "\n#define _TAO_CDR_OP_" << node->flat_name () << "_H_"; } - + bool alt = be_global->alt_mapping (); *os << be_global->core_versioning_begin (); @@ -78,7 +78,7 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) << " operator<< (" << be_idt << be_idt_nl << "TAO_OutputCDR &strm," << be_nl << "const "; - + if (alt) { *os << "std::vector<" << base_type->name () << ">"; @@ -87,23 +87,23 @@ be_visitor_sequence_cdr_op_ch::visit_sequence (be_sequence *node) { *os << node->name (); } - + *os << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl; - + if (alt) { *os << "std::vector<" << base_type->name () << ">"; } else - { + { *os << node->name (); } - + *os << " &_tao_sequence" << be_uidt_nl << ");" << be_uidt; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp index 90d74dee51b..b52d6f84967 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp @@ -97,14 +97,14 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << node->flat_name () << "_CPP_" << be_nl << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_" << be_nl; - + bool alt = be_global->alt_mapping (); *os << be_global->core_versioning_begin () << be_nl; // Set the sub state as generating code for the output operator. this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT); - + if (alt) { *os << "::CORBA::Boolean operator<< (" << be_idt_nl @@ -153,12 +153,12 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "::CORBA::ULong length = 0UL;" << be_nl << bt->full_name (); - + if (bt->size_type () == AST_Type::VARIABLE) { *os << " *"; } - + *os << " tmp;" << be_nl << be_nl << "if (! (strm >> length))" << be_idt_nl << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 864fd4cde2a..68b0e76033c 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -95,7 +95,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) } *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -103,7 +103,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) os->gen_ifdef_macro (node->flat_name ()); *os << be_nl << be_nl; - + /// If we are using std::vector, we won't be using _vars /// and _outs. They may get redefined and reinstated later. if (!be_global->alt_mapping () || !node->unbounded ()) @@ -135,9 +135,9 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) ACE_TEXT ("buffer type visit failed\n")), -1); } - + *os << "> " << node->local_name () << ";"; - + os->gen_endif (); node->cli_hdr_gen (true); return 0; @@ -147,7 +147,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << "class " << be_global->stub_export_macro () << " " << node->local_name () << be_idt_nl << ": public" << be_idt << be_idt_nl; - + int status = node->gen_base_class_name (os, "", @@ -211,7 +211,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) *os << "* buffer, " << be_nl << "::CORBA::Boolean release = false);" << be_uidt; } - + *os << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl; @@ -226,7 +226,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << be_nl << be_nl << "virtual ::CORBA::ULong maximum (void) const;"; } - + *os << be_nl; node->gen_stub_decls (os); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 2ca1b6ed917..e469dbd42a2 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -49,7 +49,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) } } - + if (be_global->alt_mapping () && node->unbounded ()) { // We are just a typedef and don't need any stub source @@ -60,7 +60,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) TAO_OutStream *os = this->ctx_->stream (); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from " << be_nl << "// "__FILE__ << ":" << __LINE__; @@ -80,7 +80,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << be_idt << be_idt_nl << "::CORBA::ULong max)" << be_uidt_nl << ": " << be_idt; - + int status = node->gen_base_class_name (os, "", @@ -199,7 +199,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "return this->size ();" << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "void" << be_nl << node->name () << "::length ( ::CORBA::ULong length)" @@ -207,7 +207,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) << "{" << be_idt_nl << "this->resize (length);" << be_uidt_nl << "}"; - + *os << be_nl << be_nl << "::CORBA::ULong" << be_nl << node->name () << "::maximum (void) const" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp index 3b79e6390ee..6e3bb5659e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for sequences. + * Visitor generating code for TAO::DCPS::Serializer operators for sequences. * This uses compiled marshaling. * * @@ -78,20 +78,20 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) *os << be_nl << be_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " ::CORBA::Boolean _tao_is_bounded_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " size_t _dcps_max_marshaled_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_global->stub_export_macro () + *os << be_global->stub_export_macro () << " size_t _dcps_find_size (" << be_idt << be_idt_nl << "const " << node->name () << " &" << be_uidt_nl << ");" << be_uidt_nl; - *os << be_nl << be_nl + *os << be_nl << be_nl << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (" << be_idt << be_idt_nl << "TAO::DCPS::Serializer &," << be_nl @@ -111,7 +111,7 @@ be_visitor_sequence_serializer_op_ch::visit_sequence (be_sequence *node) if (be_global->gen_dcps_type_support_only ()) { - *os << be_nl << be_nl << "#if 0 // disable TAO specific code" + *os << be_nl << be_nl << "#if 0 // disable TAO specific code" << be_nl << be_nl; } node->cli_hdr_serializer_op_gen (1); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp index 9e346007206..ef8c729839e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp @@ -996,12 +996,12 @@ switch (this->ctx_->sub_state ()) break; case AST_Decl::NT_string: *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl - << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]));" + << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]));" << be_uidt_nl; break; case AST_Decl::NT_wstring: *os << "the_length += _dcps_max_marshaled_size_ulong () " << be_nl - << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]) * sizeof (CORBA::WChar));" + << "+ (_tao_sequence[i] == 0 ? 0 : ACE_OS::strlen (_tao_sequence[i]) * sizeof (CORBA::WChar));" << be_uidt_nl; break; case AST_Decl::NT_interface: @@ -1256,12 +1256,12 @@ switch (this->ctx_->sub_state ()) case AST_Decl::NT_interface: case AST_Decl::NT_interface_fwd: *os << "//DCPS does not support interfaces"; - + break; case AST_Decl::NT_string: case AST_Decl::NT_wstring: *os << "_tao_marshal_flag = (strm << _tao_sequence[i]);"; - + break; case AST_Decl::NT_valuetype: case AST_Decl::NT_valuetype_fwd: @@ -1269,7 +1269,7 @@ switch (this->ctx_->sub_state ()) case AST_Decl::NT_eventtype_fwd: case AST_Decl::NT_valuebox: *os << "//DCPS does not support value types"; - + break; case AST_Decl::NT_pre_defined: { diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp index cfffd42a31e..a75e0a0af1b 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp @@ -42,7 +42,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - + be_module *module = 0; if (node->is_nested ()) { @@ -68,9 +68,9 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - + *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () @@ -79,15 +79,15 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp index 42fb3f3c335..09e3ca4f1da 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp @@ -77,7 +77,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) *os << be_global->core_versioning_end () << be_nl; } - + be_module *module = 0; if (node->is_nested ()) @@ -174,15 +174,15 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node) << "_tao_elem" << be_uidt_nl << ");" << be_uidt << be_uidt << be_uidt_nl << "}"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n"; } } - + *os << be_global->core_versioning_begin () << be_nl; // Copying insertion. diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp index 8649bb5000f..2d6ac05bf4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp @@ -49,7 +49,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node) *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator<< (TAO_OutputCDR &, const " << node->name () << " &);" << be_nl; - + *os << be_global->stub_export_macro () << " ::CORBA::Boolean" << " operator>> (TAO_InputCDR &, " << node->name () << " &);" << be_nl; @@ -71,7 +71,7 @@ be_visitor_structure_cdr_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_ch::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp index 93037b0067b..992bf766873 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp @@ -42,7 +42,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -73,7 +73,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -91,14 +91,14 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) *os << "strm"; } - *os << "," << be_nl + *os << "," << be_nl << node->name () << " &"; - + if (! node->is_local ()) { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -116,9 +116,9 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs::" "visit_structure - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } *os << "return" << be_idt_nl; @@ -127,7 +127,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_cdr_op_cs" "::visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp index 3ba993d300f..6c87e1d66e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for + * Visitor generating code for TAO::DCPS::Serializer operators for * structures. This uses compiled marshaling. * * @@ -49,18 +49,18 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) IDL_GlobalData::DCPS_Data_Type_Info* info; if (0 != (info = idl_global->is_dcps_type(node->name()))) { - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _dcps_has_key(const " + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _dcps_has_key(const " << node->name() << "& val);" << be_nl; *os << "// This structure supports use of std::map with a key" << be_nl << "// defined by one or more #pragma DCPS_DATA_KEY lines." << be_nl - << "struct " << be_global->stub_export_macro () << " " + << "struct " << be_global->stub_export_macro () << " " << node->name()->last_component() << "KeyLessThan " << be_nl << "{" << be_idt_nl << "bool operator() (" << be_idt << be_idt_nl << "const " << node->name() << "& v1," << be_nl - << "const " << node->name() << "& v2) const" << be_uidt << be_uidt_nl + << "const " << node->name() << "& v2) const" << be_uidt << be_uidt_nl << "{" << be_idt_nl; if (info->key_list_.is_empty()) @@ -96,7 +96,7 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) *os << ")"; iter.advance (); - if (iter.done ()) + if (iter.done ()) *os << ";" << be_uidt_nl; else *os << " || " << be_nl; @@ -106,17 +106,17 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) << "};" << be_nl << be_nl; } - //- _dcps_max_marshaled_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (const " + //- _dcps_max_marshaled_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (const " << node->name() << "& _tao_aggregate);" << be_nl; - //- _tao_is_bounded_size(type) method - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (const " + //- _tao_is_bounded_size(type) method + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate);" << be_nl; - //- _dcps_find_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (const " + //- _dcps_find_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (const " << node->name() << "& _tao_aggregate);" << be_nl; *os << be_global->stub_export_macro () << " ::CORBA::Boolean" @@ -148,7 +148,7 @@ be_visitor_structure_serializer_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_ch::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp index de822568d77..0d37fc6848f 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp @@ -44,7 +44,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -56,7 +56,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) IDL_GlobalData::DCPS_Data_Type_Info* info; if (0 != (info = idl_global->is_dcps_type(node->name()))) { - *os << "::CORBA::Boolean _dcps_has_key (const " + *os << "::CORBA::Boolean _dcps_has_key (const " << node->name() << "& ) { " << be_idt_nl; if (info->key_list_.is_empty()) *os << "return false;"; @@ -67,11 +67,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _dcps_max_marshaled_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_MAX_MARSHALED_SIZE); - *os << "size_t " - << "_dcps_max_marshaled_size (const " + *os << "size_t " + << "_dcps_max_marshaled_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl - << "ACE_UNUSED_ARG (_tao_aggregate);" + << "ACE_UNUSED_ARG (_tao_aggregate);" << " // sometimes not used - avoid warning" << be_nl; { @@ -83,9 +83,9 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_serializer_op_cs::" "visit_structure - " - "codegen for field decl scope failed\n"), + "codegen for field decl scope failed\n"), -1); - } + } #ifdef DCPS_DEBUG_IDL *os << "size_t result = 0;" << be_nl; @@ -98,11 +98,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } - *os << ";" << be_uidt << be_uidt_nl; + *os << ";" << be_uidt << be_uidt_nl; #ifdef DCPS_DEBUG_IDL *os << "return result;" << be_uidt_nl; #endif @@ -111,7 +111,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _tao_is_bounded_size(type) method this->ctx_->sub_state (TAO_CodeGen::TAO_IS_BOUNDED_SIZE); - *os << "::CORBA::Boolean _tao_is_bounded_size (const " + *os << "::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl; @@ -129,7 +129,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } @@ -138,11 +138,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) //- _dcps_find_size(type) method -- like max_marshaled_size but use len - not max. this->ctx_->sub_state (TAO_CodeGen::TAO_FIND_SIZE); - *os << "size_t " - << "_dcps_find_size(const " + *os << "size_t " + << "_dcps_find_size(const " << node->name() << "& _tao_aggregate)" << be_nl << "{" << be_idt_nl - << "ACE_UNUSED_ARG(_tao_aggregate);" + << "ACE_UNUSED_ARG(_tao_aggregate);" << " // sometimes not used - avoid warning" << be_nl; { @@ -160,11 +160,11 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } } - *os << ";" << be_uidt << be_uidt_nl; + *os << ";" << be_uidt << be_uidt_nl; #ifdef DCPS_DEBUG_IDL *os << "return result;" << be_uidt_nl; #endif @@ -191,7 +191,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs::" "visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -209,14 +209,14 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) *os << "strm"; } - *os << "," << be_nl + *os << "," << be_nl << node->name () << " &"; - + if (! node->is_local ()) { *os << "_tao_aggregate"; } - + *os << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; @@ -237,7 +237,7 @@ be_visitor_structure_serializer_op_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure_serializer_op_cs" "::visit_structure - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp index 9558e7507a7..befe7cd5254 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp @@ -90,7 +90,7 @@ be_visitor_structure::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure::" "visit_field - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -100,7 +100,7 @@ be_visitor_structure::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_structure::" "visit_field - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp index da53e48b739..4511bc5c293 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp @@ -44,7 +44,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) node->gen_common_varout (os); *os << be_nl << be_nl; - + *os << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__; @@ -54,7 +54,7 @@ int be_visitor_structure_ch::visit_structure (be_structure *node) << "{" << be_idt; node->gen_stub_decls (os); - + *os << be_nl; // Generate code for field members. diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp index 4df083567e3..3bb30b2cd85 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp @@ -35,7 +35,7 @@ be_visitor_structure_fwd_ch::visit_structure_fwd (be_structure_fwd *node) TAO_OutStream *os = this->ctx_->stream (); - be_structure *fd = + be_structure *fd = be_structure::narrow_from_decl (node->full_definition ()); // This will be a no-op if it has already been done for this node. diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp index aff66b8fae4..e6cf00d24e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp @@ -37,8 +37,8 @@ be_visitor_typecode_decl::visit_type (be_type *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - - // If -GA is used but anyop macro isn't set, defaults to stub macro. + + // If -GA is used but anyop macro isn't set, defaults to stub macro. const char *export_macro = (be_global->gen_anyop_files () ? this->ctx_->non_null_export_macro () : be_global->stub_export_macro ()); diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 5d0da43b4d0..a794fbaa858 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -107,7 +107,7 @@ be_visitor_typecode_defn::gen_typecode_ptr (be_type * node) ACE_TEXT ("Error parsing nested name\n")), -1); } - + be_util::gen_nested_namespace_begin (&os, module); os << "::CORBA::TypeCode_ptr const _tc_" @@ -197,7 +197,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node) ACE_TEXT ("Error parsing nested name\n")), -1); } - + be_util::gen_nested_namespace_begin (&os, module); os << "extern ::CORBA::TypeCode_ptr const _tc_" @@ -211,7 +211,7 @@ be_visitor_typecode_defn::gen_forward_declared_typecode (be_type * node) os << "extern ::CORBA::TypeCode_ptr const " << node->tc_name () << ";" << be_uidt; } - + os << be_nl; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp index f8ae13522e2..6bc508d57d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp @@ -106,7 +106,7 @@ be_visitor_typedef::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_array - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -116,7 +116,7 @@ be_visitor_typedef::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_array - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -190,7 +190,7 @@ be_visitor_typedef::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_enum - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -200,7 +200,7 @@ be_visitor_typedef::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_enum - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -276,7 +276,7 @@ be_visitor_typedef::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_sequence - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -286,7 +286,7 @@ be_visitor_typedef::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_sequence - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -365,7 +365,7 @@ be_visitor_typedef::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_structure - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -375,7 +375,7 @@ be_visitor_typedef::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_structure - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -453,7 +453,7 @@ be_visitor_typedef::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_union - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -463,7 +463,7 @@ be_visitor_typedef::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_typedef::" "visit_union - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp index 1de1131be30..88803e3e0dc 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp @@ -44,7 +44,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; be_module *module = 0; - + AST_Decl *decl = node; if (decl->is_nested ()) { @@ -67,14 +67,14 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) "Error parsing nested name\n"), -1); } - + // Some compilers handle "any" operators in a namespace // corresponding to their module, others do not. *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n"; - + be_util::gen_nested_namespace_begin (os, module); - - + + *os << macro << " void operator<<= (::CORBA::Any &, const ::" << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, ::" << node->name () @@ -83,9 +83,9 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) << node->name () << " *&); // deprecated\n"; *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ::" << node->name () << " *&);"; - + be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl << "#else\n\n"; @@ -93,7 +93,7 @@ be_visitor_union_any_op_ch::visit_union (be_union *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name () << " &); // copying version" << be_nl; *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp index e70f3b780a7..9eb1b269eb4 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp @@ -93,7 +93,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) if (decl->defined_in ()->scope_node_type () == AST_Decl::NT_module) { module = be_module::narrow_from_scope (decl->defined_in ()); - + if (!module) { ACE_ERROR_RETURN ((LM_ERROR, @@ -177,10 +177,10 @@ be_visitor_union_any_op_cs::visit_union (be_union *node) << "}"; be_util::gen_nested_namespace_end (os, module); - + // Emit #else. *os << be_nl << be_nl - << "#else\n"; + << "#else\n"; } } diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp index 3330928c7e0..a3133be104e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp @@ -32,8 +32,8 @@ be_visitor_union_cdr_op_ch::~be_visitor_union_cdr_op_ch (void) int be_visitor_union_cdr_op_ch::visit_union (be_union *node) { - if (node->cli_hdr_cdr_op_gen () - || node->imported () + if (node->cli_hdr_cdr_op_gen () + || node->imported () || node->is_local ()) { return 0; @@ -70,7 +70,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_cdr_op_ch::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp index 8037b830cc5..c40efadc350 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp @@ -58,7 +58,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; *os << be_global->core_versioning_begin () << be_nl; - + // Set the sub state as generating code for the output operator. this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT); @@ -197,7 +197,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node) << "}" << be_nl << be_nl << "return result;" << be_uidt_nl << "}" << be_nl; - + bool use_underscore = (this->ctx_->tdef () == 0); if (be_global->gen_ostream_operators ()) diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index 3564be6ade1..7dfbb40a7ed 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -71,7 +71,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node) << "{" << be_idt_nl << "this->_reset ();" << be_nl << "this->disc_ = "; - + // We use one of the enum values that isn't used in this // union if one is available. UTL_ScopedName *sn = node->value_to_name (dv.u.enum_val); diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp index 9e3f2b37554..cc0e591fbe1 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp @@ -5,7 +5,7 @@ * * $Id$ * - * Visitor generating code for TAO::DCPS::Serializer operators for unions. + * Visitor generating code for TAO::DCPS::Serializer operators for unions. * This uses compiled marshaling. * * @@ -32,8 +32,8 @@ be_visitor_union_serializer_op_ch::~be_visitor_union_serializer_op_ch (void) int be_visitor_union_serializer_op_ch::visit_union (be_union *node) { - if (node->cli_hdr_serializer_op_gen () - || node->imported () + if (node->cli_hdr_serializer_op_gen () + || node->imported () || node->is_local ()) { return 0; @@ -44,17 +44,17 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - //- _dcps_max_marshaled_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_max_marshaled_size (const " + //- _dcps_max_marshaled_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_max_marshaled_size (const " << node->name() << "& _tao_union);" << be_nl; - //- _tao_is_bounded_size(type) method - *os << be_global->stub_export_macro () - << " ::CORBA::Boolean _tao_is_bounded_size (const " + //- _tao_is_bounded_size(type) method + *os << be_global->stub_export_macro () + << " ::CORBA::Boolean _tao_is_bounded_size (const " << node->name() << "& _tao_union);" << be_nl; - //- _dcps_find_size(type) method - *os << be_global->stub_export_macro () - << " size_t _dcps_find_size (const " + //- _dcps_find_size(type) method + *os << be_global->stub_export_macro () + << " size_t _dcps_find_size (const " << node->name() << "& _tao_union);" << be_nl; @@ -74,7 +74,7 @@ be_visitor_union_serializer_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_serializer_op_ch::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp index 7fdb4a0643e..d1b0a706521 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp @@ -104,7 +104,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union::" "visit_union_branch - " - "Bad context state\n"), + "Bad context state\n"), -1); } } @@ -114,7 +114,7 @@ be_visitor_union::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union::" "visit_union_branch - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } @@ -141,8 +141,8 @@ be_visitor_union_cdr_op_cs::pre_process (be_decl *bd) be_union_branch* b = be_union_branch::narrow_from_decl (bd); - - // Could be a type decl. + + // Could be a type decl. if (b == 0) { return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp index 9b2805e6c19..5b5be4a94c2 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp @@ -56,7 +56,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit_union - " - "bad discriminant type\n"), + "bad discriminant type\n"), -1); } @@ -67,7 +67,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit union - " - "codegen for discrminant failed\n"), + "codegen for discrminant failed\n"), -1); } @@ -78,7 +78,7 @@ int be_visitor_union_ci::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_ci::" "visit_union - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp index 0df5ee6c9fa..0a42da78f6a 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp @@ -39,7 +39,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -50,7 +50,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -79,7 +79,7 @@ be_visitor_union_branch_cdr_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -104,7 +104,7 @@ be_visitor_union_branch_cdr_op_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -128,7 +128,7 @@ be_visitor_union_branch_cdr_op_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -152,7 +152,7 @@ be_visitor_union_branch_cdr_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -172,7 +172,7 @@ be_visitor_union_branch_cdr_op_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -196,7 +196,7 @@ be_visitor_union_branch_cdr_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_cdr_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp index 98af2ab7098..17a02d69edc 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp @@ -673,7 +673,7 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node) // Retrieve the union_branch node. be_union_branch *f = be_union_branch::narrow_from_decl (this->ctx_->node ()); - + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp index 12ff5609cd5..2e3704211ca 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp @@ -543,7 +543,7 @@ be_visitor_union_branch_private_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -615,7 +615,7 @@ be_visitor_union_branch_private_ch::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp index bc33eb7a19a..fe89b58c023 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp @@ -769,7 +769,7 @@ be_visitor_union_branch_public_assign_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -866,7 +866,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 3510fbb126f..e283f9b3060 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -674,7 +674,7 @@ be_visitor_union_branch_public_ch::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -766,7 +766,7 @@ be_visitor_union_branch_public_ch::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 4c7499eadad..4e587e4077b 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -1149,7 +1149,7 @@ be_visitor_union_branch_public_ci::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -1286,7 +1286,7 @@ be_visitor_union_branch_public_ci::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp index 8d55e433c9f..f47b7aaf645 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp @@ -264,7 +264,7 @@ be_visitor_union_branch_public_constructor_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -333,7 +333,7 @@ be_visitor_union_branch_public_constructor_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp index 0f0e0dba2d5..0419304b30c 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp @@ -37,7 +37,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -48,7 +48,7 @@ be_visitor_union_branch_public_cs::visit_union_branch (be_union_branch *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -73,7 +73,7 @@ be_visitor_union_branch_public_cs::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -93,7 +93,7 @@ be_visitor_union_branch_public_cs::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -119,7 +119,7 @@ be_visitor_union_branch_public_cs::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -145,7 +145,7 @@ be_visitor_union_branch_public_cs::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -157,7 +157,7 @@ be_visitor_union_branch_public_cs::visit_structure_fwd (be_structure_fwd *node) { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -173,7 +173,7 @@ be_visitor_union_branch_public_cs::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_public_cs::" "visit_union - " - "codegen failed\n"), + "codegen failed\n"), -1); } @@ -185,7 +185,7 @@ be_visitor_union_branch_public_cs::visit_union_fwd (be_union_fwd *node) { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp index a48c03e4e2d..5114ae3b720 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp @@ -493,7 +493,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -553,7 +553,7 @@ be_visitor_union_branch_public_reset_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp index c84240fb34a..12d2e272633 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp @@ -6,7 +6,7 @@ * * $Id$ * - * Visitor generating Serializer operator declarator for union_branch + * Visitor generating Serializer operator declarator for union_branch * in the client header * * @@ -40,7 +40,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union_branch (be_union_branch *n ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_union_branch - " - "Bad union_branch type\n"), + "Bad union_branch type\n"), -1); } @@ -51,7 +51,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union_branch (be_union_branch *n ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_union_branch - " - "codegen for union_branch type failed\n"), + "codegen for union_branch type failed\n"), -1); } @@ -80,7 +80,7 @@ be_visitor_union_branch_serializer_op_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -105,7 +105,7 @@ be_visitor_union_branch_serializer_op_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -129,7 +129,7 @@ be_visitor_union_branch_serializer_op_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -153,7 +153,7 @@ be_visitor_union_branch_serializer_op_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -173,7 +173,7 @@ be_visitor_union_branch_serializer_op_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -197,7 +197,7 @@ be_visitor_union_branch_serializer_op_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_union_branch_serializer_op_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp index 642b22141bb..9024a994153 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp @@ -896,7 +896,7 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node) // Retrieve the union_branch node. be_union_branch *f = be_union_branch::narrow_from_decl (this->ctx_->node ()); - + if (f == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -1203,7 +1203,7 @@ be_visitor_union_branch_serializer_op_cs::visit_structure_fwd ( { be_structure *s = be_structure::narrow_from_decl (node->full_definition ()); - + return this->visit_structure (s); } @@ -1353,7 +1353,7 @@ be_visitor_union_branch_serializer_op_cs::visit_union_fwd ( { be_union *u = be_union::narrow_from_decl (node->full_definition ()); - + return this->visit_union (u); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp index d05451062c7..3223eb227b8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp @@ -87,7 +87,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) } *os << be_global->core_versioning_begin () << be_nl; - + *os << macro << " void operator<<= (::CORBA::Any &, " << node->name () << " *); // copying" << be_nl; @@ -98,7 +98,7 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node) << node->name () << " *&);"; *os << be_global->core_versioning_end () << be_nl; - + if (module != 0) { *os << "\n\n#endif"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index bd55e9d8ea5..787774126f2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -65,7 +65,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << be_uidt << be_nl << "{" << be_nl << "public:" << be_idt; - + node->gen_stub_decls (os); // _downcast method diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index f2940c3c9a3..7503e4cb75d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -411,7 +411,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) this->emit_copy_constructor_alloc (node); this->emit_assignment_alloc (node); this->emit_accessor_modifier (node); - + // Access to the boxed value for method signatures if (node->size_type() == AST_Type::FIXED) { @@ -428,7 +428,7 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) AST_Decl *d; be_field *field; be_visitor_context ctx (*this->ctx_); - + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); !si.is_done (); si.next ()) @@ -453,8 +453,8 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node) "visit_field failed\n" ), -1); } - - // Restore the valuebox node in the field visitor's context. + + // Restore the valuebox node in the field visitor's context. ctx.node (this->ctx_->node ()); } @@ -492,10 +492,10 @@ be_visitor_valuebox_ci::visit_union (be_union *node) this->emit_copy_constructor_alloc (node); this->emit_assignment_alloc (node); this->emit_accessor_modifier (node); - + be_valuebox *vb_node = be_valuebox::narrow_from_decl (this->ctx_->node ()); - + if (node->size_type() == AST_Type::FIXED) { this->emit_boxed_access (node, ""); @@ -510,7 +510,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) AST_Decl *d; be_union_branch *member; be_visitor_context ctx (*this->ctx_); - + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); !si.is_done (); si.next ()) @@ -535,7 +535,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) "visit_field failed\n" ), -1); } - + // Restore the valuebox node to the union member visitor's // context. ctx.node (vb_node); diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index 721e6a2780c..746d8510392 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -131,7 +131,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "{" << be_idt_nl << "return true;" << be_uidt_nl << "}" << be_nl << be_nl; - + if (be_global->any_support ()) { @@ -181,7 +181,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) bool is_array = false; const char * unmarshal_arg; be_predefined_type *bpt = be_predefined_type::narrow_from_decl (bt); - + if (bpt != 0) { switch (bpt->pt()) @@ -256,7 +256,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) << "{" << be_idt_nl << "return " << node->name () << "::_tao_unmarshal (" << be_idt << be_idt << be_idt_nl - << " indrected_strm, vb_object);" + << " indrected_strm, vb_object);" << be_uidt << be_uidt << be_uidt << be_uidt_nl << "}" << be_uidt_nl << be_nl << "ACE_NEW_RETURN (" << be_idt_nl @@ -269,7 +269,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) *os << at->full_name() << "_forany temp (vb_object->_boxed_inout ());" << be_nl; } - + *os << "return (strm >> "; be_string *str = be_string::narrow_from_decl (bt); @@ -451,7 +451,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) // Retrieve the base type since we will need to do some code // generation for it. be_type *bt = be_type::narrow_from_decl (node->base_type ()); - + if (bt == 0) { ACE_ERROR_RETURN ((LM_ERROR, @@ -553,7 +553,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) // Accessor: const *os << "const "; - + if (bt->accept (&bt_visitor) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -562,7 +562,7 @@ be_visitor_valuebox_cs::visit_sequence (be_sequence *node) "base type visit failed\n"), -1); } - + *os << " &" << be_nl; *os << vb_node->name () << "::operator[] ( ::CORBA::ULong index) const" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 04a380e5d87..c0d670a8dd8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -131,7 +131,7 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node) op = be_operation::narrow_from_scope (this->ctx_->scope ()); } - + if (op == 0) { ACE_ERROR_RETURN ((LM_ERROR, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp index f6596ae982f..a47d0530d4a 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp @@ -21,7 +21,7 @@ be_visitor_valuetype_field_cdr_ch::be_visitor_valuetype_field_cdr_ch ( be_visitor_context *ctx ) : be_visitor_decl (ctx), - pre_ (""), + pre_ (""), post_ ("") { } @@ -40,7 +40,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_field - " - "Bad field type\n"), + "Bad field type\n"), -1); } @@ -51,7 +51,7 @@ be_visitor_valuetype_field_cdr_ch::visit_field (be_field *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_field - " - "codegen for field type failed\n"), + "codegen for field type failed\n"), -1); } @@ -77,7 +77,7 @@ be_visitor_valuetype_field_cdr_ch::visit_array (be_array *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_array - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -101,7 +101,7 @@ be_visitor_valuetype_field_cdr_ch::visit_enum (be_enum *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -125,7 +125,7 @@ be_visitor_valuetype_field_cdr_ch::visit_sequence (be_sequence *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_sequence - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -149,7 +149,7 @@ be_visitor_valuetype_field_cdr_ch::visit_structure (be_structure *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_struct - " - "codegen failed\n"), + "codegen failed\n"), -1); } } @@ -173,7 +173,7 @@ be_visitor_valuetype_field_cdr_ch::visit_typedef (be_typedef *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_typedef - " - "Bad primitive type\n"), + "Bad primitive type\n"), -1); } @@ -197,7 +197,7 @@ be_visitor_valuetype_field_cdr_ch::visit_union (be_union *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_field_cdr_ch::" "visit_enum - " - "codegen failed\n"), + "codegen failed\n"), -1); } } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index 8a6e3c08018..a2343809d41 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -96,7 +96,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_valuetype_marshal_cs::" "visit_valuetype - " - "codegen for field out cdr scope failed\n"), + "codegen for field out cdr scope failed\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp index 82c62ac1892..005288f8ecc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp @@ -65,7 +65,7 @@ be_visitor_obv_module::visit_module (be_module *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_obv_module::" "visit_module - " - "codegen for scope failed\n"), + "codegen for scope failed\n"), -1); } @@ -119,7 +119,7 @@ be_visitor_obv_module::visit_valuetype (be_valuetype *node) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_obv_module::" "visit_valuetype - " - "failed to accept visitor\n"), + "failed to accept visitor\n"), -1); } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 5f3d7fde7d2..7bc6ee39687 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -110,7 +110,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) "codegen for get_attribute failed\n"), -1); } - + get_op.destroy (); if (node->readonly ()) @@ -153,7 +153,7 @@ be_visitor_valuetype::visit_attribute (be_attribute *node) "codegen for set_attribute failed\n"), -1); } - + set_op.destroy (); rt.destroy (); @@ -803,7 +803,7 @@ be_visitor_valuetype::gen_obv_init_constructor_args (be_valuetype *node, &sn); ft->seen_in_operation (seen); visitor.visit_argument (&arg); - + // AST_Argument inherits from AST_Field, which will destroy // its field type if it is anonymous - we don't want that. arg.be_decl::destroy (); @@ -904,14 +904,14 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node) // If we inherit from CORBA::Object and/or CORBA::AbstractBase // (in addition to CORBA::ValueBase) we have to override _add_ref() - // and _remove_ref() by calling the one in DefaultValueRefCountBase + // and _remove_ref() by calling the one in DefaultValueRefCountBase // to avoid ambiguity. if (node->n_supports () > 0) { return true; } - // VT needs RefCounter if it has concrete factory. + // VT needs RefCounter if it has concrete factory. if (be_valuetype::FS_CONCRETE_FACTORY == node->determine_factory_style ()) { return true; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 2579e9e9243..e02d269741d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -167,7 +167,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt; - + node->gen_stub_decls (os); if (is_an_amh_exception_holder) @@ -270,7 +270,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *os << "virtual ::CORBA::Boolean " << "_tao_match_formal_type (ptrdiff_t ) const;" << be_nl; } - + if (be_global->gen_ostream_operators ()) { *os << "virtual std::ostream &_tao_stream_v (std::ostream &) const;" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 89ccc543ffe..ad2d247c1b1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -286,7 +286,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << "}" << be_nl << be_nl; } } - + if (be_global->gen_ostream_operators ()) { *os << "std::ostream &" << be_nl @@ -294,10 +294,10 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << be_nl << "{" << be_idt_nl << "strm << \"" << node->name () << "(\""; - - unsigned long index = 0; + + unsigned long index = 0; this->gen_ostream_operator_r (node, index); - + *os << be_nl << " << \")\";" << be_nl << be_nl << "return strm;" << be_uidt_nl @@ -476,35 +476,35 @@ be_visitor_valuetype_cs::gen_ostream_operator_r (be_valuetype *node, { TAO_OutStream *os = this->ctx_->stream (); AST_Type *parent = node->inherits_concrete (); - - // Recurse up the parent chain. + + // Recurse up the parent chain. if (parent != 0) { this->gen_ostream_operator_r (be_valuetype::narrow_from_decl (parent), index); } - + // Generate output for the members of whichever recursion we are in. for (UTL_ScopeActiveIterator i (node, UTL_Scope::IK_decls); !i.is_done (); i.next ()) { be_field *f = be_field::narrow_from_decl (i.item ()); - + // No way to access the private members from generated code. if (f == 0 || f->visibility () != AST_Field::vis_PUBLIC) { continue; } - + if (index++ != 0) { *os << " << \", \""; } - + *os << be_nl << " << "; - + ACE_CString instance_name ("this->"); instance_name += f->local_name ()->get_string (); f->gen_member_ostream_operator (os, diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp index 198fcdf617d..f55ee58087c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp @@ -62,7 +62,7 @@ be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node) ), -1); } } // if !opt_accessor () - + return 0; } @@ -77,9 +77,9 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node) { be_visitor_context new_ctx (*this->ctx_); be_visitor_valuetype_field_ci visitor (&new_ctx); - + visitor.in_obv_space_ = 1; - + if (visitor.visit_field (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -88,6 +88,6 @@ be_visitor_valuetype_obv_ci::visit_field (be_field *node) "visit_field failed\n"), -1); } - + return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 247650ef5d6..3828f5a4ade 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -102,12 +102,12 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) << "public:" << be_idt_nl; *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl; - + // No copy constructor for locality constraint interface. *os << "private:" << be_idt_nl << class_name.c_str () << " (const " << class_name.c_str () << "& rhs);" << be_uidt_nl; - + *os << "};" << be_nl << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp index aca619a2558..fbc7765aa8e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp @@ -91,14 +91,14 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( << node->local_name () << " *&);"; be_util::gen_nested_namespace_end (os, module); - + *os << be_nl << be_global->core_versioning_end () << be_nl; - + // emit #else *os << "#else\n\n"; } - + *os << be_global->core_versioning_begin () << be_nl; *os << macro << " void" @@ -110,7 +110,7 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd ( *os << macro << " ::CORBA::Boolean" << " operator>>= (const ::CORBA::Any &, " << node->name () << " *&);"; - + *os << be_global->core_versioning_end () << be_nl; if (module != 0) { diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp index fe495eac0ae..3777b2db14d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp @@ -69,7 +69,7 @@ be_visitor_valuetype_fwd_cdr_op_ci::visit_valuetype_fwd ( //@@ Boris: Can I move this to be_valuetype? (as with _var, _out, etc?) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ + << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; //This is just declaration so no ACE_INLINE diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index ee69f2cf69a..1fac8128c4a 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -297,7 +297,7 @@ DRV_parse_args (long ac, char **av) ACE_TEXT_CHAR_TO_TCHAR (av[i]) )); } - + break; // Temp directory for the IDL compiler to keep its files. case 't': diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 5f46956c061..ba48332ab7d 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -741,7 +741,7 @@ namespace // local/internal helper function { return; // Null filename not allowed. } - + ACE_CString const name_str (incl_file); ACE_CString const simple ("orb.idl"); ACE_CString const nix_path ("tao/orb.idl"); @@ -1040,7 +1040,7 @@ DRV_pre_proc (const char *myfile) tmp_ifile, myfile); ACE_OS::fclose (file); - + UTL_String *utl_string = 0; #if defined (ACE_OPENVMS) diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp index 324f2dd4628..7365f1930da 100644 --- a/TAO/TAO_IDL/fe/fe_declarator.cpp +++ b/TAO/TAO_IDL/fe/fe_declarator.cpp @@ -100,7 +100,7 @@ FE_Declarator::compose (AST_Decl *d) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (ct); - + // Every other template parameter kind is legal. if (ph->info ()->type_ == AST_Decl::NT_const) { @@ -110,7 +110,7 @@ FE_Declarator::compose (AST_Decl *d) } AST_Decl::NodeType nt = d->node_type (); - + if (nt == AST_Decl::NT_struct_fwd || nt == AST_Decl::NT_union_fwd || nt == AST_Decl::NT_struct diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp index a03b151e796..c1070defaeb 100644 --- a/TAO/TAO_IDL/fe/fe_extern.cpp +++ b/TAO/TAO_IDL/fe/fe_extern.cpp @@ -101,7 +101,7 @@ FE_yyparse (void) #else ACE_OS::fclose (tao_yyin); #endif /* USE_MCPP_BUFFER_LEXING */ - + return result; } diff --git a/TAO/TAO_IDL/fe/fe_home_header.cpp b/TAO/TAO_IDL/fe/fe_home_header.cpp index 05b8f624e9d..33fec49c214 100644 --- a/TAO/TAO_IDL/fe/fe_home_header.cpp +++ b/TAO/TAO_IDL/fe/fe_home_header.cpp @@ -166,16 +166,16 @@ FE_HomeHeader::compile_primary_key (UTL_ScopedName *primary_key) { AST_Param_Holder *ph = AST_Param_Holder::narrow_from_decl (d); - + nt = ph->info ()->type_; - + if (nt != AST_Decl::NT_type && nt != AST_Decl::NT_valuetype) { idl_global->err ()->mismatched_template_param ( ph->info ()->name_.c_str ()); } - + break; } default: diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 370cc756c16..5ff00a90d6e 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -92,25 +92,25 @@ fe_populate_global_scope (void) Identifier void_id ("void"); UTL_ScopedName void_name (&void_id, 0); - + pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_void, &void_name); - + root->fe_add_predefined_type (pdt); - + /// Put this prefix in force while we're creating the /// CORBA module and its contents. char *prefix = ACE::strnew ("omg.org"); idl_global->pragma_prefixes ().push (prefix); - + Identifier corba_id ("CORBA"); UTL_ScopedName sn (&corba_id, 0); - + AST_Module *m = idl_global->gen ()->create_module (root, &sn); - + root->fe_add_module (m); idl_global->corba_module (m); @@ -118,142 +118,142 @@ fe_populate_global_scope (void) idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_long, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_ulong, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_longlong, 0); - + m->fe_add_predefined_type(pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_ulonglong, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_short, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_ushort, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_float, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_double, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_longdouble, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_char, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_wchar, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_octet, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_any, 0); - + m->fe_add_predefined_type (pdt); pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_boolean, 0); - + m->fe_add_predefined_type (pdt); Identifier Object_id ("Object"); UTL_ScopedName Object_name (&Object_id, 0); - + pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_object, &Object_name); - + m->fe_add_predefined_type (pdt); // Add these to make all keywords protected even in different spellings Identifier ValueBase_id ("ValueBase"); UTL_ScopedName ValueBase_name (&ValueBase_id, 0); - + pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_value, &ValueBase_name); - + m->fe_add_predefined_type (pdt); Identifier AbstractBase_id ("AbstractBase"); UTL_ScopedName AbstractBase_name (&AbstractBase_id, 0); - + pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_abstract, &AbstractBase_name); - + m->fe_add_predefined_type (pdt); Identifier TypeCode_id ("TypeCode"); UTL_ScopedName TypeCode_name (&TypeCode_id, 0); - + pdt = idl_global->gen ()->create_predefined_type ( AST_PredefinedType::PT_pseudo, &TypeCode_name); - + m->fe_add_predefined_type (pdt); - + char *trash = 0; idl_global->pragma_prefixes ().pop (trash); ACE::strdelete (trash); diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp index 73978c4b195..764fd9f4b3c 100644 --- a/TAO/TAO_IDL/fe/fe_interface_header.cpp +++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp @@ -292,7 +292,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces, // We will crash if we continue from here. throw Bailout (); } - + // Look it up. d = s->lookup_by_name (item, true); // full_def_only diff --git a/TAO/TAO_IDL/fe/fe_utils.cpp b/TAO/TAO_IDL/fe/fe_utils.cpp index b0643ba061e..4114e9fe472 100644 --- a/TAO/TAO_IDL/fe/fe_utils.cpp +++ b/TAO/TAO_IDL/fe/fe_utils.cpp @@ -71,7 +71,7 @@ FE_Utils::T_ARGLIST::destroy (void) { i.next (d); tmp = *d; - + /// This is a problem - nodes that aren't NT_const have /// already been destroyed. Must find some other way of /// ferreting out the NT_const arglist nodes. @@ -174,7 +174,7 @@ FE_Utils::ExprTypeToPredefinedType (AST_Expression::ExprType et) ACE_ERROR ((LM_ERROR, ACE_TEXT ("FE_Utils::ExprTypeToPredefinedType - ") ACE_TEXT ("no pathing PredefinedType enum value\n"))); - + /// A deliberately odd return value, so the caller can check /// it and take further action if necessary. return AST_PredefinedType::PT_pseudo; @@ -262,16 +262,16 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, struct_name += "Connection"; Identifier struct_id (struct_name.c_str ()); UTL_ScopedName sn (&struct_id, 0); - + // In case this call comes from the backend. We // will pop the scope before returning. idl_global->scopes ().push (c); - + AST_Structure *connection = idl_global->gen ()->create_structure (&sn, 0, 0); struct_id.destroy (); - + /// If the field type is a param holder, we want /// to use the lookup to create a fresh one, /// since the field will own it and destroy it. @@ -296,7 +296,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, Identifier module_id ("Components"); UTL_ScopedName scoped_name (&module_id, &local_name); - + d = c->lookup_by_name (&scoped_name, true); local_id.destroy (); module_id.destroy (); @@ -346,7 +346,7 @@ FE_Utils::create_uses_multiple_stuff (AST_Component *c, seq_id.destroy (); (void) c->fe_add_typedef (connections); - + // In case this call comes from the backend. idl_global->scopes ().pop (); } @@ -372,15 +372,15 @@ FE_Utils::create_implied_ami_uses_stuff (void) AST_Decl *d = idl_global->root ()->lookup_by_name (sn, true); - + if (d == 0) { idl_global->err ()->lookup_error (sn); - + sn->destroy (); delete sn; sn = 0; - + continue; } @@ -397,18 +397,18 @@ FE_Utils::create_implied_ami_uses_stuff (void) ACE_TEXT ("implied_ami_uses_stuff - ") ACE_TEXT ("narrow to receptacle ") ACE_TEXT ("failed\n"))); - + continue; } - + if (!u->is_multiple ()) { continue; } - + AST_Component *c = AST_Component::narrow_from_scope (u->defined_in ()); - + if (c == 0) { ACE_ERROR ((LM_ERROR, @@ -416,13 +416,13 @@ FE_Utils::create_implied_ami_uses_stuff (void) ACE_TEXT ("implied_ami_uses_stuff - ") ACE_TEXT ("receptacle not defined") ACE_TEXT ("in a component\n"))); - + continue; } - + FE_Utils::create_uses_multiple_stuff (c, u, "sendc"); } - + idl_global->included_ami_receps_done (true); } @@ -539,7 +539,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file, // If the include path has literal "s (because of an include // of a Windows path with spaces), we must remove them here. const char *tmp_inc_file = inc_file.c_str (); - + if (tmp_inc_file && FE_Utils::hasspace (tmp_inc_file) && tmp_inc_file[0] == '\"') @@ -556,7 +556,7 @@ FE_Utils::is_include_file_found (ACE_CString & inc_file, if (full_path != 0) { FILE *test = ACE_OS::fopen (abspath, "r"); - + if (test == 0) { return false; @@ -581,26 +581,26 @@ FE_Utils::validate_included_idl_files (void) { // Flag to make sure we don't repeat things. static bool already_done = false; - + if (already_done) { return; } - + already_done = true; // New number of included_idl_files. size_t newj = 0; - + size_t n_pre_preproc_includes = idl_global->n_included_idl_files (); - + char **pre_preproc_includes = idl_global->included_idl_files (); - + size_t n_post_preproc_includes = idl_global->n_include_file_names (); - + UTL_String **post_preproc_includes = idl_global->include_file_names (); @@ -616,12 +616,12 @@ FE_Utils::validate_included_idl_files (void) // @see bug TAO#711 / Bugzilla #3513 for more char** ordered_include_files = new char* [n_pre_preproc_includes]; - + for (size_t i = 0u; i < n_post_preproc_includes; ++i) { post_tmp = post_preproc_includes [i]->get_string (); full_path = ACE_OS::realpath (post_tmp, post_abspath); - + if (full_path) { for (size_t j = 0u; j < n_pre_preproc_includes; ++j) @@ -662,7 +662,7 @@ FE_Utils::validate_included_idl_files (void) full_path = ACE_OS::realpath (pre_partial.c_str (), pre_abspath); - + if (full_path && FE_Utils::path_cmp (pre_abspath, post_abspath) == 0 && ACE_OS::access (post_abspath, R_OK) == 0) @@ -815,7 +815,7 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl, { AST_Decl::NodeType pnt = prev_decl->node_type (); AST_Decl::NodeType cnt = curr_decl->node_type (); - + switch (cnt) { /// For these, any non-zero previous decl @@ -832,14 +832,14 @@ FE_Utils::can_be_redefined (AST_Decl *prev_decl, default: break; } - + UTL_Scope *prev_scope = prev_decl->defined_in (); UTL_Scope *curr_scope = curr_decl->defined_in (); AST_Structure *s = 0; AST_StructureFwd *s_fwd = 0; AST_Interface *i = 0; AST_InterfaceFwd *i_fwd = 0; - + bool nt_eq = (pnt == cnt); bool s_eq = (prev_scope == curr_scope); diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index 9eb8e97dd62..e6e07944a69 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -3415,7 +3415,7 @@ static ACE_CDR::ULongLong idl_atoui (char *s, long b) { ACE_CDR::ULongLong r = 0; - + if (b == 8 && *s == '0') { ++s; diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp index 82a566d4e04..b78f70f6dfe 100644 --- a/TAO/TAO_IDL/fe/y.tab.cpp +++ b/TAO/TAO_IDL/fe/y.tab.cpp @@ -2057,7 +2057,7 @@ int tao_yydebug; # define TAO_YYMAXDEPTH 10000 #endif - + #if TAO_YYERROR_VERBOSE @@ -2268,7 +2268,7 @@ tao_yysyntax_error (char *tao_yyresult, int tao_yystate, int tao_yychar) } } #endif /* TAO_YYERROR_VERBOSE */ - + /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -2293,7 +2293,7 @@ tao_yydestruct (tao_yymsg, tao_yytype, tao_yyvaluep) tao_yymsg = "Deleting"; TAO_YY_SYMBOL_PRINT (tao_yymsg, tao_yytype, tao_yyvaluep, tao_yylocationp); } - + /* Prevent warnings from -Wmissing-prototypes. */ @@ -6180,7 +6180,7 @@ tao_yyreduce: s->is_local (), s->is_abstract () ); - + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { @@ -6242,7 +6242,7 @@ tao_yyreduce: s->is_local (), s->is_abstract () ); - + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { @@ -6332,7 +6332,7 @@ tao_yyreduce: (tao_yyval.dcval) ) ); - + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { @@ -6492,7 +6492,7 @@ tao_yyreduce: (tao_yyvsp[(3) - (3)].elval) = 0; sn.destroy (); - + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { @@ -8141,7 +8141,7 @@ tao_yyreduce: AST_Decl *d = s->lookup_by_name ((tao_yyvsp[(2) - (3)].idlist), true, false); - + if (d == 0) { idl_global->err ()->lookup_error ((tao_yyvsp[(2) - (3)].idlist)); diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index 514bda44ac8..2125f730f01 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -198,7 +198,7 @@ DRV_drive (const char *s) UTL_String *utl_string = 0; ACE_NEW (utl_string, UTL_String (s, true)); - + idl_global->idl_src_file (utl_string); // Pass through CPP. @@ -376,7 +376,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Does various things in various backends. BE_post_init (DRV_files, DRV_nfiles); - + FILE *output_file = 0; if (idl_global->multi_file_input ()) @@ -400,7 +400,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) DRV_drive (DRV_files[DRV_file_index]); } } - + if (idl_global->multi_file_input ()) { ACE_OS::fclose (output_file); diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index af81e591ee9..8dc14514adb 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -1558,17 +1558,17 @@ UTL_Error::scope_masking_error (AST_Decl *masked, this_file, idl_global->lineno (), masked->full_name () )); - + const bool same_file = (0 == ACE_OS::strcmp (this_file, masked_file)); - + if (!same_file) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("%C "), masked_file)); } - + ACE_ERROR ((LM_ERROR, ACE_TEXT ("line %d but hidden by local \""), masked->line ())); @@ -1576,11 +1576,11 @@ UTL_Error::scope_masking_error (AST_Decl *masked, ACE_ERROR ((LM_ERROR, ACE_TEXT ("::%C\""), masking->full_name ())); - + const bool same_file_again = (same_file && 0 == ACE_OS::strcmp (this_file, masking_file)); - + if (!same_file_again) { ACE_ERROR ((LM_ERROR, @@ -1593,11 +1593,11 @@ UTL_Error::scope_masking_error (AST_Decl *masked, ACE_ERROR ((LM_ERROR, ACE_TEXT (" at "))); } - + ACE_ERROR ((LM_ERROR, ACE_TEXT ("line %d ?\n"), masking->line () )); -} +} void UTL_Error::anonymous_type_diagnostic (void) @@ -1606,24 +1606,24 @@ UTL_Error::anonymous_type_diagnostic (void) { return; } - + bool aw = idl_global->anon_warning (); bool nw = (idl_global->compile_flags () & IDL_CF_NOWARNINGS); - + if (aw && nw) { return; } - + ErrorCode ec = (aw ? EIDL_ANONYMOUS_WARNING : EIDL_ANONYMOUS_ERROR); - + idl_error_header (ec, idl_global->lineno (), idl_global->filename ()->get_string ()); - + ACE_ERROR ((LM_ERROR, "\n")); - + if (ec == EIDL_ANONYMOUS_ERROR) { idl_global->set_err_count (idl_global->err_count () + 1); diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 2f0bc4362b9..d6ab8b6fb00 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -102,7 +102,7 @@ char* IDL_GlobalData::translateName(const char* name, char *name_buf) ACE_OS::strcpy (name_buf, transName); transName = name_buf; } - + return (transName == 0 || ((int)transName) == -1 ) ? 0 : transName; } #endif @@ -206,7 +206,7 @@ IDL_GlobalData::IDL_GlobalData (void) ace_root); #endif /* ACE_GPERF */ } - + #if defined (IDL_ANON_ERROR) this->anon_type_diagnostic_ = ANON_TYPE_ERROR; #elif defined (IDL_ANON_WARNING) @@ -1357,7 +1357,7 @@ IDL_GlobalData::check_gperf (void) // to <errno> again, so that it can be used to print error // messages. errno = WEXITSTATUS (wait_status); - + if (errno) { // <exec> has failed. @@ -1522,23 +1522,23 @@ IDL_GlobalData::fini (void) ACE::strdelete (entry->ext_id_); ACE::strdelete (entry->int_id_); } - + DCPS_Type_Info_Map::ENTRY *dcps_entry = 0; - + for (DCPS_Type_Info_Map::ITERATOR dcps_iter ( this->dcps_type_info_map_); !dcps_iter.done (); dcps_iter.advance ()) { dcps_iter.next (dcps_entry); - + dcps_entry->int_id_->name_->destroy (); delete dcps_entry->int_id_->name_; dcps_entry->int_id_->name_ = 0; - + delete dcps_entry->int_id_; dcps_entry->int_id_ = 0; - + delete [] dcps_entry->ext_id_; dcps_entry->ext_id_ = 0; } @@ -1583,19 +1583,19 @@ void IDL_GlobalData::recursion_start (const char *val) { ACE::strdelete (this->recursion_start_); - + /// Strip off any trailing slashes (not needed /// for further processing). ACE_CString tmp (val); ACE_CString::size_type len = tmp.length (); ACE_TCHAR c = tmp[len - 1]; - + while (c == '\\' || c == '/') { tmp = tmp.substr (0, --len); c = tmp[len - 1]; } - + this->recursion_start_ = ACE::strnew (tmp.c_str ()); } @@ -1634,7 +1634,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id) { // Check if the type already exists. DCPS_Data_Type_Info* newinfo ; - + if (this->dcps_type_info_map_.find (id, newinfo) != 0) { // No existing entry, add one. @@ -1645,7 +1645,7 @@ IDL_GlobalData::add_dcps_data_type (const char* id) UTL_ScopedName* t1 = FE_Utils::string_to_scoped_name (foo_type); - + // Chained with null Identifier required!! UTL_ScopedName* target = new UTL_ScopedName (new Identifier (""), t1); @@ -1698,7 +1698,7 @@ IDL_GlobalData::is_dcps_type (UTL_ScopedName* target) { // Traverse the entire map. DCPS_Type_Info_Map::ENTRY* entry ; - + for (DCPS_Type_Info_Map::ITERATOR current ( this->dcps_type_info_map_); current.next (entry); diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp index baff5a6a2a7..f8a410b05b4 100644 --- a/TAO/TAO_IDL/util/utl_identifier.cpp +++ b/TAO/TAO_IDL/util/utl_identifier.cpp @@ -109,13 +109,13 @@ Identifier::Identifier (const char *s) const char *eh_suffix = "_excep"; ACE_CString::size_type pos = str.length () - ACE_OS::strlen (eh_suffix); - + // If we have an AMI exception holder suffix, strip it off. if (str.find (eh_suffix) == pos) { str = str.substr (0, pos); } - + TAO_IDL_CPP_Keyword_Table cpp_key_tbl; unsigned int len = static_cast<unsigned int> (str.length ()); diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp index 87a9c834bfc..aef844b80ef 100644 --- a/TAO/TAO_IDL/util/utl_labellist.cpp +++ b/TAO/TAO_IDL/util/utl_labellist.cpp @@ -100,16 +100,16 @@ UTL_LabelList * UTL_LabelList::copy (void) { AST_Expression *val = this->pd_car_data->label_val (); - + AST_Expression *val_copy = 0; ACE_NEW_RETURN (val_copy, AST_Expression (val, val->ev ()->et), 0); - + AST_UnionLabel *label_copy = idl_global->gen ()->create_union_label (this->pd_car_data->label_kind (), val_copy); - + UTL_LabelList *retval = 0; ACE_NEW_RETURN (retval, UTL_LabelList (label_copy, diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp index 1cf623cb90d..e5ff59333fb 100644 --- a/TAO/TAO_IDL/util/utl_namelist.cpp +++ b/TAO/TAO_IDL/util/utl_namelist.cpp @@ -107,7 +107,7 @@ UTL_NameList::destroy (void) this->pd_car_data->destroy (); delete this->pd_car_data; this->pd_car_data = 0; - + this->UTL_List::destroy (); } diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 1d37dad6748..e062e4ca196 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -480,7 +480,7 @@ UTL_Scope::fe_add_decl (AST_Decl *t) { // Already defined and cannot be redefined? Or already used? AST_Decl *d = this->lookup_for_add (t); - + if (d) { if (!FE_Utils::can_be_redefined (d, t)) @@ -576,7 +576,7 @@ AST_Structure * UTL_Scope::fe_add_full_struct_type (AST_Structure *t) { AST_Decl *predef = this->lookup_for_add (t); - + if (predef) { if (!FE_Utils::can_be_redefined (predef, t)) @@ -587,7 +587,7 @@ UTL_Scope::fe_add_full_struct_type (AST_Structure *t) predef); return 0; } - + if (referenced (predef, t->local_name ()) && !t->is_defined ()) { idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE, @@ -953,7 +953,7 @@ UTL_Scope::lookup_pseudo (Identifier *e) bool *seen = 0; char *name_string = e->get_string (); UTL_Scope *start_scope = idl_global->corba_module (); - + if (ACE_OS::strcasecmp (name_string, "TypeCode") == 0 || ACE_OS::strcasecmp (name_string, "TCKind") == 0) { @@ -980,13 +980,13 @@ UTL_Scope::lookup_pseudo (Identifier *e) { return 0; } - + for (UTL_ScopeActiveIterator i (start_scope, IK_decls); !i.is_done (); i.next ()) { AST_Decl *d = i.item (); - + if (e->case_compare (d->local_name ())) { // These have to be located here because we are just looking @@ -1003,7 +1003,7 @@ UTL_Scope::lookup_pseudo (Identifier *e) if (this->which_pseudo_ == PSEUDO_TYPECODE) { AST_Decl *d = this->look_in_prev_mods_local (e); - + if (d != 0) { // Generation of #includes for Typecode.h @@ -1035,17 +1035,17 @@ AST_Decl * UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et) { UTL_Scope *search = idl_global->corba_module (); - + AST_PredefinedType::PredefinedType pdt = FE_Utils::ExprTypeToPredefinedType (et); - + /// This return value means there was no PredefinedType match - /// for the ExprType. + /// for the ExprType. if (pdt == AST_PredefinedType::PT_pseudo) { return 0; } - + /// The only 'predefined type' not in the CORBA module. if (pdt == AST_PredefinedType::PT_void) { @@ -1057,12 +1057,12 @@ UTL_Scope::lookup_primitive_type (AST_Expression::ExprType et) i.next ()) { AST_Decl *as_decl = i.item (); - + if (as_decl->node_type () == AST_Decl::NT_pre_defined) { AST_PredefinedType *t = AST_PredefinedType::narrow_from_decl (as_decl); - + if (t->pt () == pdt) { if (idl_global->in_main_file ()) @@ -1211,7 +1211,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, // scope-expanding iteration below. Identifier *name = e->head (); const bool global_scope_name = work->is_global_name (name); - + if (global_scope_name) { // Remove the preceeding "::" or "" from the scopename @@ -1223,7 +1223,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, } AST_Decl *d = work->lookup_by_name_r (e, full_def_only); - + if (d == 0) { // If all else fails, look though each outer scope. @@ -1232,7 +1232,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, outer = ScopeAsDecl (outer)->defined_in ()) { d = outer->lookup_by_name_r (e, full_def_only); - + if (d != 0) { work = outer; @@ -1243,12 +1243,12 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, ACE_Unbounded_Queue<AST_Decl *> &masks = idl_global->masking_scopes (); - + if (d != 0 && !global_scope_name) { ACE_Unbounded_Queue<AST_Decl *>::CONST_ITERATOR i (masks); AST_Decl **item = 0; - + if (i.next (item)) { // The first queue item (last enqueued) will always @@ -1257,13 +1257,13 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, // Now check that the rest of the names don't collide const char *const name_str = name->get_string (); - + while (i.advance ()) { i.next (item); const char *const item_name_str = (*item)->local_name ()->get_string (); - + if (!ACE_OS::strcmp (item_name_str, name_str) && !(*item)->masking_checks (outer_decl)) { @@ -1280,7 +1280,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e, /// Doesn't add if d == 0. work->add_to_referenced (d, false, name); } - + masks.reset (); return d; } @@ -1291,7 +1291,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, { bool work_another_level; UTL_Scope *work = this; - + do { // Will catch Object, TypeCode, TCKind, ValueBase and @@ -1299,7 +1299,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, // generation of some #includes and, whether successful or not, // incurs no extra overhead. AST_Decl *d = work->lookup_pseudo (e->head ()); - + if (d) { return d; @@ -1324,7 +1324,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, // lookup. AST_Param_Holder *param_holder = UTL_Scope::match_param (e); - + if (param_holder) { return param_holder; @@ -1334,7 +1334,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, work_another_level = false; // Until we find something. bool in_corba = (ACE_OS::strcmp (e->head ()->get_string (), "CORBA") == 0); - + for (UTL_ScopeActiveIterator i (work, IK_decls); !i.is_done (); i.next ()) @@ -1356,7 +1356,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, } UTL_Scope *next = DeclAsScope (d); // The next scope to search - + if (next) { work = next; @@ -1382,7 +1382,7 @@ UTL_Scope::lookup_by_name_r (UTL_ScopedName *e, i.next ()) { AST_Decl *d = i.item (); - + if (d->local_name ()->case_compare (e->head ())) { return d; @@ -1830,7 +1830,7 @@ UTL_Scope::dump (ACE_OSTREAM_TYPE &o) i.next ()) { AST_Decl *d = i.item (); - + if (!d->imported ()) { idl_global->indent ()->skip_to (o); @@ -1849,7 +1849,7 @@ UTL_Scope::dump (ACE_OSTREAM_TYPE &o) j.next ()) { AST_Decl *d = j.item (); - + if (!d->imported ()) { idl_global->indent ()->skip_to (o); diff --git a/TAO/bin/rm_exception_macros.pl b/TAO/bin/rm_exception_macros.pl index 7f3691380a1..e9ae6b2d82e 100755 --- a/TAO/bin/rm_exception_macros.pl +++ b/TAO/bin/rm_exception_macros.pl @@ -136,7 +136,7 @@ sub process_file { if ($ats && index($val, ';') == 0 && !($lines[$#lines] =~ /\/\/.*$/ || $lines[$#lines] =~ /\/\*.*\*\/$/)) { - $lines[$#lines] .= $val; + $lines[$#lines] .= $val; $line = ''; } else { @@ -226,7 +226,7 @@ sub process_file { $line = $sp . $line; } else { - $lines[$#lines] .= $line; + $lines[$#lines] .= $line; $line = ''; } } diff --git a/TAO/bin/subst_env.pl b/TAO/bin/subst_env.pl index be4007b7a61..ffe5b00a757 100755 --- a/TAO/bin/subst_env.pl +++ b/TAO/bin/subst_env.pl @@ -1,11 +1,11 @@ #!/usr/bin/perl # # $Id$ -# +# # This script eases the transition from the CORBA::Environment& ACE_TRY_ENV # declarations and method parameters to the ACE_ENV_ARG macros. # It was used for converting TAO between versions 1.2.1 and 1.2.2. -# The converted output is written to stdout. +# The converted output is written to stdout. # Typical usage would be as follows: # perl subst_env.pl file_with_acetryenv.cpp >file_with_taoenvarg.cpp # diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp index 23a2bb46f12..49d5a8b7c8e 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_i.cpp @@ -37,7 +37,7 @@ Quoter_Stock_i::get_price_and_names (CORBA::String_out symbol, { symbol = CORBA::string_dup (this->symbol_.c_str ()); full_name = CORBA::string_dup (this->full_name_.c_str ()); - + return this->price_; } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl index 388c75bac83..2620d6901ea 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.idl @@ -16,7 +16,7 @@ module Stock { - /** + /** * @class StockBroker * @brief Provides interfaces for stock broker clients. */ @@ -33,7 +33,7 @@ module Stock /// Gets the current quoter connection. StockQuoter get_connection_quoter_info (); - + /// Shutdown the object and terminate the application oneway void shutdown (); }; @@ -42,12 +42,12 @@ module Stock * @class StockBrokerHome * @brief Interface that aids in managing StockBroker lifecycles. */ - interface StockBrokerHome + interface StockBrokerHome { /// Create a StockBroker object. StockBroker create (in StockDistributor dist, in string stock_name); - }; + }; }; #endif diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp index 794606956a0..bda7ce45f5c 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker_i.cpp @@ -39,19 +39,19 @@ Stock_StockBroker_i::Stock_StockBroker_i (CORBA::ORB_ptr orb, // Create a child POA with CLIENT_PROPAGATED policies. The name of // the POA will be <StockNameConsumer_POA>. Instances of the // Stock_StockNameConsumer_i will be activated under this POA. - PortableServer::POA_var child_poa = - poa->create_POA ("StockNameConsumer_POA", + PortableServer::POA_var child_poa = + poa->create_POA ("StockNameConsumer_POA", poa_mgr. in(), consumer_policies); - + // Narrow the POA to a <RTPortableServer::POA>. RTPortableServer::POA_var rt_poa = RTPortableServer::POA::_narrow (child_poa.in ()); // Create and activate the <consumer_>. - this->consumer_ = + this->consumer_ = new Stock_StockNameConsumer_i (*this, stock_name); - PortableServer::ServantBase_var nameconsumer_owner_transfer = + PortableServer::ServantBase_var nameconsumer_owner_transfer = this->consumer_; rt_poa->activate_object (this->consumer_); } @@ -84,20 +84,20 @@ void Stock_StockBroker_i::connect_quoter_info (::Stock::StockQuoter_ptr c) return Stock::StockQuoter::_duplicate (this->quoter_.in ()); } -void +void Stock_StockBroker_i::shutdown (void) { // Unsubscribe ACE_DEBUG ((LM_DEBUG, "Shutdown unsubscribing notifiers\n")); this->distributor_->unsubscribe_notifier (this->consumer_->cookie_ ()); - + ACE_DEBUG ((LM_DEBUG, "Shutdown deactivating object\n")); ::Stock::StockBroker_var broker = this->_this (); - PortableServer::ObjectId_var oid = + PortableServer::ObjectId_var oid = this->_default_POA ()->reference_to_id (broker.in ()); - - this->_default_POA ()->deactivate_object (oid.in ()); + + this->_default_POA ()->deactivate_object (oid.in ()); } // Implementation skeleton constructor @@ -119,11 +119,11 @@ Stock_StockBrokerHome_i::Stock_StockBrokerHome_i (CORBA::ORB_ptr orb) cookie_factory); Stock::Priority_Mapping::register_mapping (orb); - + // Register this class as an event handler with the ORB to catch - // ctrl-c from the command line. + // ctrl-c from the command line. if (orb_->orb_core ()->reactor ()->register_handler (SIGINT, this) == -1) - ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", + ACE_DEBUG ((LM_DEBUG, "ERROR: Failed to register as a signal handler: %p\n", "register_handler\n")); } @@ -132,7 +132,7 @@ Stock_StockBrokerHome_i::~Stock_StockBrokerHome_i (void) { } -::Stock::StockBroker_ptr +::Stock::StockBroker_ptr Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist, const char *stock_name) { @@ -143,7 +143,7 @@ Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist, // is the <RootPOA>. Stock_StockBroker_i *broker = new Stock_StockBroker_i (orb_.in (), dist, stock_name); - PortableServer::ServantBase_var owner_transfer + PortableServer::ServantBase_var owner_transfer = broker; this->broker_ = broker->_this (); } @@ -151,18 +151,18 @@ Stock_StockBrokerHome_i::create (Stock::StockDistributor_ptr dist, return Stock::StockBroker::_duplicate (this->broker_.in ()); } -int +int Stock_StockBrokerHome_i::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_DEBUG ((LM_DEBUG, "Disconnecting all brokers..\n")); - + this->broker_->shutdown (); - + ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); - + this->orb_->shutdown (0); - + return 0; } diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl index f044cbc95a7..9db8b4dcf1d 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Common.idl @@ -16,7 +16,7 @@ module Stock { - exception Invalid_Stock + exception Invalid_Stock { }; @@ -53,7 +53,7 @@ module Stock interface StockNameConsumer { void push_StockName (in StockNames the_stocknames); - + attribute Cookie cookie_; }; @@ -61,7 +61,7 @@ module Stock * @class StockQuoter * @brief Provides an interface for brokers to get detailed stock information. */ - interface StockQuoter + interface StockQuoter { /// Returns detailed stock information to brokers. /// @param stockname A valid name for a stock. @@ -70,4 +70,4 @@ module Stock }; }; -#endif +#endif diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl index 9ad0eb583cb..347a7470331 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor.idl @@ -30,12 +30,12 @@ module Stock /// Event source operation to establish connectivity. /// @param c An object reference to the consumer the distributor should notify /// @returns A cookie used to identify the subscription. - Cookie subscribe_notifier (in Stock::StockNameConsumer c, + Cookie subscribe_notifier (in Stock::StockNameConsumer c, in RTCORBA::Priority priority); /// Opteration to discontinue connectivity. /// @param ck The cookie that identifies the connection to be terminated. - Stock::StockNameConsumer unsubscribe_notifier (in Cookie ck) + Stock::StockNameConsumer unsubscribe_notifier (in Cookie ck) raises (Invalid_Subscription); /// Factory operation to return StockQuoter object reference. @@ -46,7 +46,7 @@ module Stock /// Controls rate of updates. attribute long notification_rate; - + /// Shutdown the object and terminate the application oneway void shutdown (); }; @@ -59,7 +59,7 @@ module Stock { /// Create a StockDistributor object. StockDistributor create (); - }; + }; }; #endif diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp index 7b019efa254..0a34e87a184 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.tpp @@ -18,20 +18,20 @@ struct Map_Init : map_ (map) { } - + void operator () (const typename Stock_Database<CALLBACK>::Init_Map::value_type &item) { typename Stock_Database<CALLBACK>::StockInfo stock_info (item.first.c_str ()); - - // If the initial value is nonzero, use that - otherwise, use a number + + // If the initial value is nonzero, use that - otherwise, use a number // between 0 and 100 - stock_info.low_ = - stock_info.last_ = + stock_info.low_ = + stock_info.last_ = stock_info.high_ = item.second ? item.second : ACE_OS::rand () % 100; - + map_[item.first] = stock_info; } - + typename Stock_Database<CALLBACK>::Stock_Map &map_; }; @@ -45,7 +45,7 @@ Stock_Database<CALLBACK>::Stock_Database (u_int rate) map["IBM"] = 0; map["MSFT"] = 0; map["INTEL"] = 0; - + std::for_each (map.begin (), map.end (), Map_Init<CALLBACK> (this->stock_map_)); @@ -61,7 +61,7 @@ Stock_Database<CALLBACK>::Stock_Database (const char *file, u_int rate) } template <typename CALLBACK> -Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap, +Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap, u_int rate) : rate_ (rate), active_ (false) @@ -73,18 +73,18 @@ Stock_Database<CALLBACK>::Stock_Database (const Init_Map &stockmap, // get_stock_info template <typename CALLBACK> -typename Stock_Database<CALLBACK>::StockInfo +typename Stock_Database<CALLBACK>::StockInfo Stock_Database<CALLBACK>::get_stock_info(const char *name) { ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex, guard, this->lock_, StockInfo ("Error")); - + // Locate the <stock_name> in the database. ACE_DEBUG ((LM_DEBUG, "*** message: searching the stock_map_ for the stock_name\n")); - + typename Stock_Map::iterator iter = this->stock_map_.find (std::string (name)); if (iter == this->stock_map_.end ()) @@ -101,21 +101,21 @@ Stock_Database<CALLBACK>::register_callback (CALLBACK &obj) { ACE_Utils::UUID uuid; ACE_Utils::UUID_GENERATOR::instance ()->generate_UUID (uuid); - + this->callbacks_[uuid.to_string ()->c_str ()] = &obj; - + return uuid.to_string ()->c_str (); } template <typename CALLBACK> -void +void Stock_Database<CALLBACK>::update_rate (u_int rate) { this->rate_ = rate; } template <typename CALLBACK> -void +void Stock_Database<CALLBACK>::start (void) { if (!this->active_) @@ -132,7 +132,7 @@ Stock_Database<CALLBACK>::start (void) } template <typename CALLBACK> -void +void Stock_Database<CALLBACK>::stop (void) { ACE_WRITE_GUARD (ACE_RW_Thread_Mutex, @@ -143,7 +143,7 @@ Stock_Database<CALLBACK>::stop (void) } template <typename CALLBACK> -int +int Stock_Database<CALLBACK>::handle_signal (int, siginfo_t *, ucontext_t *) @@ -154,89 +154,89 @@ Stock_Database<CALLBACK>::handle_signal (int, -1); std::ifstream input (this->filename_.c_str ()); - + std::string name; u_int value = 0; - + typename Stock_Database<CALLBACK>::Init_Map map; - + while (input.good ()) { input >> name; input >> value; map[name] = value; } - + input.close (); - + std::for_each (map.begin (), map.end (), Map_Init<CALLBACK> (this->stock_map_)); - + return 0; } template <typename CALLBACK> struct Stock_Updater -{ +{ void operator () (typename Stock_Database<CALLBACK>::Stock_Map::value_type &item) { // Determine if the stock has changed. if (ACE_OS::rand () % 2) return; // Nope! On to the next! - + changed_.push_back (item.first); - + // Determine the amount of change of the stock. We will // only permit a 5 point change at a time in either direction int delta = ACE_OS::rand () % 10 - 5; - + // We don't want negative stock values! if (item.second.last_ <= delta) delta *= -1; - + // Calculate the new values for the stock. item.second.last_ += delta; - + if (item.second.last_ < item.second.low_) item.second.low_ = item.second.last_; else if (item.second.last_ > item.second.high_) item.second.high_ = item.second.last_; } - + void operator () (typename Stock_Database<CALLBACK>::Callback_Map::value_type &item) { (*item.second) (changed_); } - + private: std::vector <std::string> changed_; -}; - +}; + template <typename CALLBACK> -int +int Stock_Database<CALLBACK>::svc (void) { ACE_DEBUG ((LM_DEBUG, "tock!\n")); - - while (this->active_) + + while (this->active_) { { // Init our functor Stock_Updater<CALLBACK> updater; - + { // Control the scope of our mutex to avoid deadlock. ACE_WRITE_GUARD_RETURN (ACE_RW_Thread_Mutex, guard, this->lock_, -1); - + updater = std::for_each (this->stock_map_.begin (), this->stock_map_.end (), updater); } - + // Update stock prices // notify callbacks std::for_each (this->callbacks_.begin (), diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp index 0623650f173..6a225a70048 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Stock_Factory_i.cpp @@ -22,5 +22,5 @@ Quoter_Stock_Factory_i::get_stock (const char *symbol) } catch (PortableServer::POA::ObjectNotActive &) { throw Quoter::Invalid_Stock_Symbol (); - } + } } diff --git a/TAO/examples/Advanced/ch_12/CCS.idl b/TAO/examples/Advanced/ch_12/CCS.idl index 23f39993b0c..b54568f6cba 100644 --- a/TAO/examples/Advanced/ch_12/CCS.idl +++ b/TAO/examples/Advanced/ch_12/CCS.idl @@ -21,14 +21,14 @@ #pragma prefix "acme.com" -module CCS +module CCS { typedef unsigned long AssetType; typedef string ModelType; typedef short TempType; typedef string LocType; - interface Thermometer + interface Thermometer { readonly attribute ModelType model; readonly attribute AssetType asset_num; @@ -38,9 +38,9 @@ module CCS void remove (); }; - interface Thermostat : Thermometer + interface Thermostat : Thermometer { - struct BtData + struct BtData { TempType requested; TempType min_permitted; @@ -54,7 +54,7 @@ module CCS raises (BadTemp); }; - interface Controller + interface Controller { exception DuplicateAsset {}; @@ -72,7 +72,7 @@ module CCS enum SearchCriterion { ASSET, LOCATION, MODEL }; - union KeyType switch (SearchCriterion) + union KeyType switch (SearchCriterion) { case ASSET: AssetType asset_num; @@ -82,7 +82,7 @@ module CCS ModelType model_desc; }; - struct SearchType + struct SearchType { KeyType key; Thermometer device; @@ -90,7 +90,7 @@ module CCS typedef sequence<SearchType> SearchSeq; - struct ErrorDetails + struct ErrorDetails { Thermostat tmstat_ref; Thermostat::BtData info; @@ -105,6 +105,6 @@ module CCS ThermometerSeq list (); void find (inout SearchSeq slist); void change (in ThermostatSeq tlist, in short delta) - raises (EChange); + raises (EChange); }; }; diff --git a/TAO/examples/Advanced/ch_12/run_test.pl b/TAO/examples/Advanced/ch_12/run_test.pl index 0e61abce82c..42d1271e24a 100755 --- a/TAO/examples/Advanced/ch_12/run_test.pl +++ b/TAO/examples/Advanced/ch_12/run_test.pl @@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) { -$server->Terminate (); +$server->Terminate (); if ($server->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $server->Kill (); $server->TimedWait (1); diff --git a/TAO/examples/Advanced/ch_18/CCS.idl b/TAO/examples/Advanced/ch_18/CCS.idl index c0daa0f995f..0625b03aa1e 100644 --- a/TAO/examples/Advanced/ch_18/CCS.idl +++ b/TAO/examples/Advanced/ch_18/CCS.idl @@ -98,6 +98,6 @@ module CCS { void change( in ThermostatSeq tlist, in short delta ) raises(EChange); - + }; }; diff --git a/TAO/examples/Advanced/ch_18/run_test.pl b/TAO/examples/Advanced/ch_18/run_test.pl index f167dafbaec..a6f17fc19f9 100755 --- a/TAO/examples/Advanced/ch_18/run_test.pl +++ b/TAO/examples/Advanced/ch_18/run_test.pl @@ -50,7 +50,7 @@ if ($client->TimedWait (60) == -1) { # gracefully kill the server -$server->Terminate (); +$server->Terminate (); if ($server->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $server->Kill (); $server->TimedWait (1); @@ -58,7 +58,7 @@ if ($server->TimedWait (5) == -1) { } # gracefully kill the Naming Service -$NS->Terminate (); +$NS->Terminate (); if ($NS->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $NS->Kill (); $server->TimedWait (1); diff --git a/TAO/examples/Advanced/ch_21/CCS.idl b/TAO/examples/Advanced/ch_21/CCS.idl index 05e22799459..199e48a5f85 100644 --- a/TAO/examples/Advanced/ch_21/CCS.idl +++ b/TAO/examples/Advanced/ch_21/CCS.idl @@ -99,6 +99,6 @@ module CCS { void change( in ThermostatSeq tlist, in short delta ) raises(EChange); - + }; }; diff --git a/TAO/examples/Advanced/ch_21/run_test.pl b/TAO/examples/Advanced/ch_21/run_test.pl index 0e61abce82c..42d1271e24a 100755 --- a/TAO/examples/Advanced/ch_21/run_test.pl +++ b/TAO/examples/Advanced/ch_21/run_test.pl @@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) { -$server->Terminate (); +$server->Terminate (); if ($server->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $server->Kill (); $server->TimedWait (1); diff --git a/TAO/examples/Advanced/ch_3/run_test.pl b/TAO/examples/Advanced/ch_3/run_test.pl index 0e61abce82c..42d1271e24a 100755 --- a/TAO/examples/Advanced/ch_3/run_test.pl +++ b/TAO/examples/Advanced/ch_3/run_test.pl @@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) { -$server->Terminate (); +$server->Terminate (); if ($server->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $server->Kill (); $server->TimedWait (1); diff --git a/TAO/examples/Advanced/ch_3/time.idl b/TAO/examples/Advanced/ch_3/time.idl index de8582dc048..2251a7fa48f 100644 --- a/TAO/examples/Advanced/ch_3/time.idl +++ b/TAO/examples/Advanced/ch_3/time.idl @@ -18,14 +18,14 @@ // // ============================================================================ -struct TimeOfDay +struct TimeOfDay { short hour; // 0 - 23 short minute; // 0 - 59 short second; // 0 - 59 }; -interface Time +interface Time { TimeOfDay get_gmt (); }; diff --git a/TAO/examples/Advanced/ch_8_and_10/run_test.pl b/TAO/examples/Advanced/ch_8_and_10/run_test.pl index 0e61abce82c..42d1271e24a 100755 --- a/TAO/examples/Advanced/ch_8_and_10/run_test.pl +++ b/TAO/examples/Advanced/ch_8_and_10/run_test.pl @@ -42,7 +42,7 @@ if ($client->TimedWait (60) == -1) { -$server->Terminate (); +$server->Terminate (); if ($server->TimedWait (5) == -1) { print STDERR "ERROR: cannot terminate the server\n"; $server->Kill (); $server->TimedWait (1); diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl index 6f43ddda407..f6a2b76631e 100755 --- a/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl +++ b/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl @@ -45,7 +45,7 @@ for ($i = 0; $i < $num_servants; $i++) { my @CLS = (); my @clients_iorfile = (); $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { $clients_iorfile[$count] = $clients[$count]->LocalFile($iorfiles[$i]); $clients[$count]->DeleteFile($iorfiles[$i]); @@ -81,7 +81,7 @@ for ($i = 0; $i < $num_servants; $i++) { } $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { if ($clients[$count]->PutFile ($iorfiles[$i]) == -1) { print STDERR "ERROR: client $count cannot set file <$clients_iorfile[$count]>\n"; @@ -94,7 +94,7 @@ for ($i = 0; $i < $num_servants; $i++) { $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { my $client_status = $CLS[$count]->Spawn(); if ($client_status != 0) { @@ -128,7 +128,7 @@ for ($i = 0; $i < $num_servants; $i++) { } $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { $clients[$count]->DeleteFile($iorfiles[$i]); $count++; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl index 49be42260cb..717d74adea5 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl @@ -2,7 +2,7 @@ #ifndef CALLBACK_IDL #define CALLBACK_IDL -interface Callback +interface Callback { void test_method(); }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl index b3085f3f079..845d9ccfab7 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl @@ -6,7 +6,7 @@ exception FooException {}; exception TestException {}; - + typedef sequence<char, 32> Bounded_Var_Size; typedef sequence<char> Unbounded_Var_Size; typedef long Fixed_Array[20]; @@ -46,7 +46,7 @@ interface Foo oneway void test_fixed_array_arg(in Fixed_Array message); oneway void test_var_array_arg(in Var_Array messages); - + oneway void test_bounded_var_size_arg(in Bounded_Var_Size message); oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message); diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl index 22eb04e358f..3d6cfd5964a 100755 --- a/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl +++ b/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl @@ -19,7 +19,7 @@ foreach $i (@ARGV) { $synch_with_server_option = ""; -if ($ARGV[0] eq 'synch_with_server') { +if ($ARGV[0] eq 'synch_with_server') { $synch_with_server_option = "-s"; } elsif ($ARGV[0] eq '') { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl index 49be42260cb..717d74adea5 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl @@ -2,7 +2,7 @@ #ifndef CALLBACK_IDL #define CALLBACK_IDL -interface Callback +interface Callback { void test_method(); }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl index bdd96e9c7fb..941e9fceadd 100755 --- a/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl +++ b/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl @@ -18,30 +18,30 @@ $num_csd_threads=1; $collocated_test=0; $servant_cancellation_option=""; -if ($ARGV[0] eq 'collocated') { - # 1 servant, 1 collocated client, 1 orb thread, 2 strategy working threads +if ($ARGV[0] eq 'collocated') { + # 1 servant, 1 collocated client, 1 orb thread, 2 strategy working threads $num_clients_per_servant=1; $collocated_test=1; $num_csd_threads=2; } -elsif ($ARGV[0] eq 'multiple_servants') { +elsif ($ARGV[0] eq 'multiple_servants') { # multiple servants and single orb thread. - # 10 servant, 40 client, 1 orb thread, 10 strategy working threads + # 10 servant, 40 client, 1 orb thread, 10 strategy working threads $num_servants=10; $num_csd_threads=10; $num_clients_per_servant=4; } -elsif ($ARGV[0] eq 'multiple_orb_threads') { +elsif ($ARGV[0] eq 'multiple_orb_threads') { # multiple servants and multiple orb threads. - # 10 servant, 40 client, 4 orb thread, 10 strategy working threads + # 10 servant, 40 client, 4 orb thread, 10 strategy working threads $num_servants=10; $num_csd_threads=10; $num_clients_per_servant=4; $num_orb_threads=4; } -elsif ($ARGV[0] eq 'cancel_servant') { +elsif ($ARGV[0] eq 'cancel_servant') { # Cancel one servant and leave the other alive. - # 2 servant, 10 client, 5 orb thread, 1 strategy working threads + # 2 servant, 10 client, 5 orb thread, 1 strategy working threads $num_clients_per_servant=5; $num_servants=2; $num_csd_threads=2; @@ -49,7 +49,7 @@ elsif ($ARGV[0] eq 'cancel_servant') { $servant_cancellation_option = " -d 1 "; } elsif ($ARGV[0] eq '') { - # default test - 1 servant, 40 clients , 1 orb thread, 1 csd thread + # default test - 1 servant, 40 clients , 1 orb thread, 1 csd thread } else { print STDERR "ERROR: invalid parameter $ARGV[0] \n"; @@ -68,7 +68,7 @@ $num_clients = $num_servants * $num_clients_per_servant; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; -$SV = $server->CreateProcess("server_main", +$SV = $server->CreateProcess("server_main", "-p $iorfname_prefix -s $num_servants ". "-c $num_clients -t $num_orb_threads -n $num_csd_threads ". "-l $collocated_test $servant_cancellation_option"); @@ -92,7 +92,7 @@ for ($i = 0; $i < $num_servants; $i++) { my @CLS = (); my @clients_iorfile = (); $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { $clients_iorfile[$count] = $clients[$count]->LocalFile($iorfiles[$i]); $clients[$count]->DeleteFile($iorfiles[$i]); @@ -128,7 +128,7 @@ for ($i = 0; $i < $num_servants; $i++) { } $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { if ($clients[$count]->PutFile ($iorfiles[$i]) == -1) { print STDERR "ERROR: client $count cannot set file <$clients_iorfile[$count]>\n"; @@ -142,7 +142,7 @@ for ($i = 0; $i < $num_servants; $i++) { $count = 0; if ($collocated_test == 0) { - for ($i = 0; $i < $num_servants; $i++) { + for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { my $client_status = $CLS[$count]->Spawn(); if ($client_status != 0) { @@ -177,7 +177,7 @@ for ($i = 0; $i < $num_servants; $i++) { } $count = 0; -for ($i = 0; $i < $num_servants; $i++) { +for ($i = 0; $i < $num_servants; $i++) { for ($j = 0; $j < $num_clients_per_servant; $j++) { $clients[$count]->DeleteFile($iorfiles[$i]); $count++; diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl index 06d821c9b27..96e0b8be4e4 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Web_Server.idl @@ -15,7 +15,7 @@ module Web_Server in boolean last_chunk); }; - exception Error_Result + exception Error_Result { // Status of the <register_callback> operation. These // values should map onto the normal HTTP diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl index 5ce482af7aa..60a08452bc1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.inl @@ -1,13 +1,13 @@ // $Id$ ACE_INLINE -Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, +Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, RTScheduling::Current_ptr current, Task_Stats& task_stats, int enable_yield) : orb_ (CORBA::ORB::_duplicate (orb)), current_ (RTScheduling::Current::_duplicate (current)), task_stats_ (task_stats), - enable_yield_ (enable_yield) + enable_yield_ (enable_yield) { } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl index 5ce482af7aa..60a08452bc1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.inl @@ -1,13 +1,13 @@ // $Id$ ACE_INLINE -Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, +Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, RTScheduling::Current_ptr current, Task_Stats& task_stats, int enable_yield) : orb_ (CORBA::ORB::_duplicate (orb)), current_ (RTScheduling::Current::_duplicate (current)), task_stats_ (task_stats), - enable_yield_ (enable_yield) + enable_yield_ (enable_yield) { } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl index 5ce482af7aa..60a08452bc1 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.inl @@ -1,13 +1,13 @@ // $Id$ ACE_INLINE -Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, +Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, RTScheduling::Current_ptr current, Task_Stats& task_stats, int enable_yield) : orb_ (CORBA::ORB::_duplicate (orb)), current_ (RTScheduling::Current::_duplicate (current)), task_stats_ (task_stats), - enable_yield_ (enable_yield) + enable_yield_ (enable_yield) { } diff --git a/TAO/examples/Persistent_Grid/Grid.idl b/TAO/examples/Persistent_Grid/Grid.idl index 1f8b74be7a6..20f885c4978 100644 --- a/TAO/examples/Persistent_Grid/Grid.idl +++ b/TAO/examples/Persistent_Grid/Grid.idl @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -interface Grid +interface Grid { // = TITLE // Create a <Grid> of type <name> @@ -12,7 +12,7 @@ interface Grid attribute short width; // Width of the grid. - exception RANGE_ERROR + exception RANGE_ERROR { // = TITLE // The range of parameter values do not fall in the expected @@ -27,7 +27,7 @@ interface Grid raises (RANGE_ERROR); // Set the element [n,m] of the grid, to value. - long get (in short n, in short m) + long get (in short n, in short m) raises (RANGE_ERROR); // Return element [n,m] of the grid. @@ -45,7 +45,7 @@ interface Grid_Factory const short DEFAULT_WIDTH = 10; Grid make_grid (in short height, in short width); - // Returns a new <Grid> instance. + // Returns a new <Grid> instance. void shutdown (); // Shutdown the application. diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl index e99e330b09f..23386cbee7c 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP.idl +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP.idl @@ -4,7 +4,7 @@ interface UDP { // = TITLE - // Defines an interface that encapsulates operations that + // Defines an interface that encapsulates operations that // return the current time of day and shuts down the server. struct LongStruct diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl index cfc8408e88a..016b6f780ca 100755 --- a/TAO/examples/PluggableUDP/tests/Performance/run_test.pl +++ b/TAO/examples/PluggableUDP/tests/Performance/run_test.pl @@ -28,13 +28,13 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-ORBEndpoint diop://:$port_server " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-ORBEndpoint diop://:$port_client " . + "-ORBEndpoint diop://:$port_client " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl index 1c4ce05783c..efb07171dd4 100755 --- a/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl +++ b/TAO/examples/PluggableUDP/tests/Performance/run_test_ipv6.pl @@ -29,13 +29,13 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-ORBEndpoint diop://$hostname:$port_server " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-ORBEndpoint diop://$hostname:$port_client " . + "-ORBEndpoint diop://$hostname:$port_client " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/examples/RTScheduling/Job.idl b/TAO/examples/RTScheduling/Job.idl index d6387247eaf..f1aab1c1074 100644 --- a/TAO/examples/RTScheduling/Job.idl +++ b/TAO/examples/RTScheduling/Job.idl @@ -6,6 +6,6 @@ interface Job { void work (in unsigned long work, in short importance); - + void shutdown (); }; diff --git a/TAO/examples/Simple/grid/Grid.idl b/TAO/examples/Simple/grid/Grid.idl index 07c7c8b10a0..1a1c14bc1b4 100644 --- a/TAO/examples/Simple/grid/Grid.idl +++ b/TAO/examples/Simple/grid/Grid.idl @@ -1,7 +1,7 @@ // -*- C++ -*- // $Id$ -interface Grid +interface Grid { // = TITLE // Create a <Grid> of type <name> @@ -12,7 +12,7 @@ interface Grid attribute short width; // Width of the grid. - exception RANGE_ERROR + exception RANGE_ERROR { // = TITLE // The range of parameter values do not fall in the expected @@ -27,7 +27,7 @@ interface Grid raises (RANGE_ERROR); // Set the element [n,m] of the grid, to value. - long get (in short n, in short m) + long get (in short n, in short m) raises (RANGE_ERROR); // Return element [n,m] of the grid. @@ -45,7 +45,7 @@ interface Grid_Factory const short DEFAULT_WIDTH = 10; Grid make_grid (in short height, in short width); - // Returns a new <Grid> instance. + // Returns a new <Grid> instance. oneway void shutdown (); // Shutdown the application. diff --git a/TAO/examples/Simple/time/Time.idl b/TAO/examples/Simple/time/Time.idl index 66521161fab..3d07b80659f 100644 --- a/TAO/examples/Simple/time/Time.idl +++ b/TAO/examples/Simple/time/Time.idl @@ -4,7 +4,7 @@ interface Time { // = TITLE - // Defines an interface that encapsulates operations that + // Defines an interface that encapsulates operations that // return the current time of day and shuts down the server. long current_time (); diff --git a/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java b/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java index c10ae7d766a..2db9a3bfd43 100644 --- a/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java +++ b/TAO/examples/Simulator/DOVEBrowser/AnswerEvent.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // AnswerEvent.java // @@ -20,4 +20,4 @@ public class AnswerEvent extends java.util.EventObject { this.selected_ = selected; } } - + diff --git a/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java b/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java index 77d43646729..f66077c915e 100644 --- a/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java +++ b/TAO/examples/Simulator/DOVEBrowser/AnswerListener.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // AnswerListener.java // diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java index 647fd613bff..510c9f73714 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java +++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowser.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DOVEBrowser.java // @@ -17,31 +17,31 @@ import java.awt.*; public class DOVEBrowser { DemoCore demoCore_; - + public DOVEBrowser () { - super (); + super (); } - + public void init (String nameServiceIOR, String nameServicePort, String[] args, boolean use_queueing) { - demoCore_ = new DemoCore (nameServiceIOR, - nameServicePort, - args, - use_queueing, - null); + demoCore_ = new DemoCore (nameServiceIOR, + nameServicePort, + args, + use_queueing, + null); demoCore_.show (); demoCore_.run (); } - - public static void main (String[] args) { + + public static void main (String[] args) { String nameServiceIOR = null; String nameServicePort = null; boolean use_queueing = false; int arg_index = 0; // Loop through command line arguments, acting on relevant options - while (args.length > arg_index) + while (args.length > arg_index) { System.out.println ("args.length [" + args.length + "] arg_index [" + arg_index + "]"); @@ -51,8 +51,8 @@ public class DOVEBrowser { ++arg_index; use_queueing = true; } - else if ((args[arg_index].equals ("-nameserviceior")) && - (args.length > arg_index + 1)) + else if ((args[arg_index].equals ("-nameserviceior")) && + (args.length > arg_index + 1)) { System.out.println ("switch [" + args[arg_index] + "]"); System.out.println ("value [" + args[arg_index + 1] + "]"); @@ -77,11 +77,11 @@ public class DOVEBrowser { arg_index ++; } } - + DOVEBrowser doveBrowser = new DOVEBrowser(); doveBrowser.init (nameServiceIOR, nameServicePort, args, use_queueing); - } + } } - - + + diff --git a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java index 160eb3a363b..1d77509c3d6 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java +++ b/TAO/examples/Simulator/DOVEBrowser/DOVEBrowserApplet.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DOVEBrowserApplet.java // @@ -18,15 +18,15 @@ public class DOVEBrowserApplet extends java.applet.Applet { DemoCore demoCore_; static String nameServiceIOR_ = null; - + public DOVEBrowserApplet () { - super (); + super (); } - + public void init () { // in case of an applet use the following line, else not! nameServiceIOR_ = this.getParameter ("NSIOR"); - + if (nameServiceIOR_ == null) { System.out.println ("The DOVE Browser cannot run, because no Naming Service IOR was found!"); return; @@ -41,8 +41,8 @@ public class DOVEBrowserApplet extends java.applet.Applet { demoCore_.run (); } } - - + + diff --git a/TAO/examples/Simulator/DOVEBrowser/DataHandler.java b/TAO/examples/Simulator/DOVEBrowser/DataHandler.java index 090cccf089d..c7b336a69e2 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DataHandler.java +++ b/TAO/examples/Simulator/DOVEBrowser/DataHandler.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DataHandler.java // @@ -15,13 +15,13 @@ import org.omg.CORBA.*; public interface DataHandler { - + // entry point for an consumer to put data event into the data handler public void update (RtecEventComm.Event event); - + // get a list of the Observables names to allow selection public java.util.Enumeration getObservablesList (); - + // get a specific Observable public DemoObservable getObservable(String name); @@ -30,5 +30,5 @@ public interface DataHandler { } - - + + diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java index 272e84f7c84..4fcb542a5ef 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DemoCore.java +++ b/TAO/examples/Simulator/DOVEBrowser/DemoCore.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DemoCore.java // @@ -8,7 +8,7 @@ // // = DESCRIPTION // This class servers as the core class of the simulation demo. -// It connects the push consumer of the event service with +// It connects the push consumer of the event service with // one or several Java Beans. // // ============================================================================ @@ -31,19 +31,19 @@ public class DemoCore extends Frame { private boolean use_queueing_ = false; private boolean connections_established_ = false; - DemoCore (String nameServiceIOR, + DemoCore (String nameServiceIOR, String nameServicePort, - String[] args, + String[] args, boolean use_queueing, java.applet.Applet applet) { super (); - + use_queueing = use_queueing; setSize (600,400); setBounds (new Rectangle (50,50,800,500)); setVisible (true); - + gridbag_ = new GridBagLayout(); constraints_ = new GridBagConstraints(); constraints_.fill = GridBagConstraints.BOTH; @@ -53,8 +53,8 @@ public class DemoCore extends Frame { // Instantiate the DataHandler and the PushConsumer dataHandler_ = new NavWeapDataHandler (); - pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, - nameServiceIOR, + pushConsumerFactory_ = new PushConsumerFactory (dataHandler_, + nameServiceIOR, nameServicePort, args, use_queueing_, @@ -72,20 +72,20 @@ public class DemoCore extends Frame { menu_.add (menu_add_item_); menu_.add (menu_quit_item_); menubar_.add (menu_); - + setMenuBar (menubar_); - - menu_quit_item_.addActionListener (new ActionListener () + + menu_quit_item_.addActionListener (new ActionListener () { public void actionPerformed (ActionEvent e) { System.exit (0); } - }); - - menu_add_item_.addActionListener (new ActionListener () + }); + + menu_add_item_.addActionListener (new ActionListener () { public void actionPerformed (ActionEvent e) { - ObservablesDialog obsDialog_ = + ObservablesDialog obsDialog_ = new ObservablesDialog (DemoCore.this, dataHandler_.getObservablesList()); obsDialog_.addAnswerListener (new AnswerListener () @@ -97,18 +97,18 @@ public class DemoCore extends Frame { }); obsDialog_.setVisible (true); } - }); - + }); + // instantiate the Factory for Visualization Components visCompFactory_ = new VisCompFactory (); // Traverse the args looking for switches that determine connections. int arg_index = 0; - while (args.length > arg_index) + while (args.length > arg_index) { if (args[arg_index].equals ("-dualECdemo") || args[arg_index].equals ("-dualECdemo1") || - args[arg_index].equals ("-dualECdemo2")) + args[arg_index].equals ("-dualECdemo2")) { // Use monotonic scales in the double precision data windows DoubleVisComp.monotonic_scale (true); @@ -128,7 +128,7 @@ public class DemoCore extends Frame { } if (args[arg_index].equals ("-dualECdemo") || args[arg_index].equals ("-dualECdemo1") || - args[arg_index].equals ("-dualECdemo2")) + args[arg_index].equals ("-dualECdemo2")) { // Use monotonic scales in the double precision data windows DoubleVisComp.monotonic_scale (true); @@ -168,7 +168,7 @@ public class DemoCore extends Frame { } } - + // If connections have not been established, set up defaults if (! connections_established_) { @@ -181,39 +181,39 @@ public class DemoCore extends Frame { } - public boolean addConnection (String selected, int max_in_a_row) { + public boolean addConnection (String selected, int max_in_a_row) { // to not fill too many into it if (countVisComp_ < MAX_VIS_COMPS) { - + // get a reference to the Observable DemoObservable observable_ = dataHandler_.getObservable (selected); - + if (observable_ != null) { - + VisComp visComp_ = visCompFactory_.getNewVisComp (observable_.getProperty (), selected); if (visComp_ != null) { - vis_comp_list_.addElement (visComp_); - + vis_comp_list_.addElement (visComp_); + // connect the Observer with the Observable observable_.addObserver (visComp_); - + countVisComp_++; - + // not more than three in a row if (countVisComp_ == max_in_a_row){ constraints_.gridwidth = GridBagConstraints.REMAINDER; } if (countVisComp_ > max_in_a_row) { constraints_.gridwidth = 1; - } - + } + gridbag_.setConstraints ((java.awt.Component) visComp_, constraints_); - + // add the Visualization Component to the Frame DemoCore.this.add ((java.awt.Component) visComp_); DemoCore.this.show (); - + return true; } } @@ -224,20 +224,20 @@ public class DemoCore extends Frame { public boolean addConnection (String selected) { return addConnection (selected, 3); } - - public void init () + + public void init () { } - - public void paint (Graphics g) + + public void paint (Graphics g) { } - - public void run () + + public void run () { // Wait passive until events come in pushConsumerFactory_.run (); - } + } } - - + + diff --git a/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java b/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java index 81c85b961f8..d89217eddc3 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java +++ b/TAO/examples/Simulator/DOVEBrowser/DemoObservable.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DemoObservable.java // diff --git a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java b/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java index 228d9931fc7..4347fcc2993 100644 --- a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // DoubleVisComp.java // @@ -23,7 +23,7 @@ public class DoubleVisComp extends Canvas implements VisComp private static final int MIN_SPACING = 2; private static final int POINT_HISTORY = 200; private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10); - + private Queue plot_; private String title_; private Graphics offgraphics_; @@ -52,19 +52,19 @@ public class DoubleVisComp extends Canvas implements VisComp title_ = ""; max_value_ = 1; old_max_value_ = max_value_; - + java.util.Random rand = new java.util.Random (System.currentTimeMillis()); float hue_ = rand.nextFloat(); float brightness = rand.nextFloat(); hue_ += .075; - + if (hue_ > 1.0) hue_ -= 1.0; - + if (brightness > 0.75) brightness -= 0.25; - + Color new_color = Color.getHSBColor(hue_, 1, brightness); this.setBackground(new_color); @@ -82,7 +82,7 @@ public class DoubleVisComp extends Canvas implements VisComp public void setName (String title) { title_ = title; } - + public int getProperty () { return Properties.DOUBLE; } @@ -94,7 +94,7 @@ public class DoubleVisComp extends Canvas implements VisComp public Dimension getPreferredSize () { return new Dimension (175, 175); } - + public String getName() { return title_; } @@ -107,24 +107,24 @@ public class DoubleVisComp extends Canvas implements VisComp { Double double_temp_; try { - double_temp_ = (Double) obj; + double_temp_ = (Double) obj; } catch (Exception excp) { double_temp_ = new Double (0.0); System.out.println (excp); System.out.println ("Visualization Component received wrong data type!"); } - + float new_point = double_temp_.floatValue(); Float temp = (Float)plot_.dequeue_tail(); plot_.enqueue_head(new Float(new_point)); - + if (new_point > local_max_) { local_max_ = new_point; local_max_values_ [local_max_value_index_] = local_max_; } - + if (monotonic_scale_) { float global_max = 0; @@ -132,7 +132,7 @@ public class DoubleVisComp extends Canvas implements VisComp while (global_max > max_value_) max_value_ *= 2; - + while ((global_max < max_value_/2) && (max_value_ > old_max_value_)) max_value_ /= 2; } @@ -140,7 +140,7 @@ public class DoubleVisComp extends Canvas implements VisComp { while (local_max_ > max_value_) max_value_ *= 2; - + while ((local_max_ < max_value_/2) && (max_value_ > old_max_value_)) max_value_ /= 2; } @@ -156,7 +156,7 @@ public class DoubleVisComp extends Canvas implements VisComp Enumeration queue_iter = plot_.forward_iterator(); int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i; String value = "Value (of " + max_value_ + "): " + String.valueOf(plot_.head()); - + if ((offscreen_ == null) || (offscreensize_.width != d.width - 8) || (offscreensize_.height != d.height - 8)) @@ -171,12 +171,12 @@ public class DoubleVisComp extends Canvas implements VisComp g.draw3DRect (0, 0, d.width - 1, d.height - 1, true); g.draw3DRect (1, 1, d.width - 3, d.height - 3, true); g.draw3DRect (2, 2, d.width - 5, d.height - 5, true); - + local_max_ = 0; offgraphics_.setColor (getBackground()); offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height); - offgraphics_.setColor (getForeground()); + offgraphics_.setColor (getForeground()); offgraphics_.drawString(title_, 5, fheight); offgraphics_.drawString(value, 5, offscreensize_.height - 5); @@ -184,13 +184,13 @@ public class DoubleVisComp extends Canvas implements VisComp while (queue_iter.hasMoreElements()) { value_2 = ((Float)queue_iter.nextElement()).floatValue(); - + if (value_1 > local_max_) local_max_ = value_1; - + y1 = normalize(offscreensize_.height - fheight, value_1); y2 = normalize(offscreensize_.height - fheight, value_2); - + tmp = value_2; value_2 = value_1; value_1 = tmp; @@ -206,13 +206,13 @@ public class DoubleVisComp extends Canvas implements VisComp g.drawImage(offscreen_, 3, 3, null); } - + public void paint(Graphics g) { Dimension d = getSize (); int plot_length = plot_.length(); int num_points = d.width / spacing_; - + if (plot_.length() < num_points) { for (int i = 0; i < num_points - plot_length; i++) @@ -223,7 +223,7 @@ public class DoubleVisComp extends Canvas implements VisComp for (int i = 0; i < plot_length - num_points; i++) plot_.dequeue_tail(); } - + update(g); } @@ -244,7 +244,7 @@ public class DoubleVisComp extends Canvas implements VisComp private synchronized void local_max_init () { // Create a new, larger, array to hold the local maxima - float new_max_values [] = + float new_max_values [] = new float [local_max_value_count_ + 1]; // Copy the previously stored maxima (if any) into the new array. @@ -267,7 +267,7 @@ public class DoubleVisComp extends Canvas implements VisComp float ratio = (float)coord/max_value_; float pixels = (float)height*ratio; float location = (float)height - pixels; - + return Math.round(location); } } diff --git a/TAO/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java b/TAO/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java index 6b1c1ddb9dd..3f226234bfd 100644 --- a/TAO/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java +++ b/TAO/examples/Simulator/DOVEBrowser/MTDataHandlerAdapter.java @@ -1,6 +1,6 @@ // $Id$ -// This is an adapter class for a data handler to be used in a separate +// This is an adapter class for a data handler to be used in a separate // thread. The adapter provides a push method that places an event // set into its synchronized internal MTQueue. It runs a separate thread // which blocks until there is an event in the queue, then dequeues the @@ -38,7 +38,7 @@ public class MTDataHandlerAdapter extends Thread { for (int i = 0; i < events.length; ++i) { - if(events[i].header.type == + if(events[i].header.type == PushConsumer.ACE_ES_EVENT_NOTIFICATION) { // System.out.println ("MTDataHandlerAdapter.push updating data handler"); @@ -57,12 +57,12 @@ public class MTDataHandlerAdapter extends Thread try { // Pull an event set from the head of the queue - RtecEventComm.Event[] events = + RtecEventComm.Event[] events = (RtecEventComm.Event[]) queue_.dequeue_head (); for (int i = 0; i < events.length; ++i) { - if(events[i].header.type == + if(events[i].header.type == PushConsumer.ACE_ES_EVENT_NOTIFICATION) { dataHandler_.update (events[i]); diff --git a/TAO/examples/Simulator/DOVEBrowser/MTQueue.java b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java index 357c872c4dc..d53bf55408f 100644 --- a/TAO/examples/Simulator/DOVEBrowser/MTQueue.java +++ b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java @@ -10,10 +10,10 @@ public class MTQueue // Initially, the head and tail of the queue are null MTQueue_Node head_ = null; MTQueue_Node tail_ = null; - + // Constructor - does nothing. public MTQueue () - { + { } // Places a passed Object at the end of the queue. @@ -44,7 +44,7 @@ public class MTQueue { // Create a new node to hold the object. MTQueue_Node new_node = new MTQueue_Node(new_data); - + // Insert the node into the queue. if (head_ == null) { @@ -61,7 +61,7 @@ public class MTQueue // Wake up any waiting threads notifyAll (); } - + // Try to remove an object from the head of the queue - nonblocking. public synchronized Object try_dequeue_head() { @@ -84,7 +84,7 @@ public class MTQueue // Start with a null reference. Object return_value = null; - // Wait until there's something to dequeue. + // Wait until there's something to dequeue. while (head_ == null) { try @@ -116,13 +116,13 @@ public class MTQueue head_.prev_.next_ = null; head_.prev_.prev_ = null; head_.prev_.data_ = null; - head_.prev_ = null; + head_.prev_ = null; } // Return the object we dequeued. return return_value; } - + // Try to remove an object from the tail of the queue - nonblocking. public synchronized Object try_dequeue_tail () { @@ -145,7 +145,7 @@ public class MTQueue // Start with a null reference. Object return_value = null; - // Wait until there's something to dequeue. + // Wait until there's something to dequeue. while (tail_ == null) { try @@ -171,13 +171,13 @@ public class MTQueue head_ = null; } else - { + { return_value = tail_.data_; tail_ = tail_.prev_; tail_.next_.data_ = null; tail_.next_.next_ = null; tail_.next_.prev_ = null; - tail_.next_ = null; + tail_.next_ = null; } // Return the object we dequeued. diff --git a/TAO/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java b/TAO/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java index 1685f25c69a..4961e2aa437 100644 --- a/TAO/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/MultiDoubleVisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // MultiDoubleVisComp.java // @@ -25,7 +25,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp private static final int MIN_SPACING = 2; private static final int POINT_HISTORY = 200; private static final Font FONT = new Font ("Dialog", Font.PLAIN, 10); - + private Queue plots_ []; private int plot_count_ = 0; private String title_; @@ -62,19 +62,19 @@ public class MultiDoubleVisComp extends Canvas implements VisComp title_ = ""; max_value_ = 1; old_max_value_ = max_value_; - + java.util.Random rand = new java.util.Random (System.currentTimeMillis ()); float hue_ = rand.nextFloat (); float brightness = rand.nextFloat (); hue_ += .075; - + if (hue_ > 1.0) hue_ -= 1.0; - + if (brightness > 0.75) brightness -= 0.25; - + Color new_color = Color.getHSBColor (hue_, 1, brightness); this.setBackground (new_color); @@ -129,7 +129,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp public void setName (String title) { title_ = title; } - + public int getProperty () { return Properties.MULTIDOUBLE; } @@ -141,7 +141,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp public Dimension getPreferredSize () { return new Dimension (175, 175); } - + public String getName () { return title_; } @@ -154,14 +154,14 @@ public class MultiDoubleVisComp extends Canvas implements VisComp { Double double_array[]; try { - double_array = (Double[]) obj; + double_array = (Double[]) obj; } catch (Exception excp) { double_array = new Double [plot_count_]; for (int j = 0; j < plot_count_; ++j) { double_array [j] = new Double (0.0); - } + } System.out.println (excp); System.out.println ("Multi Double Visualization Component received wrong data type!"); } @@ -171,13 +171,13 @@ public class MultiDoubleVisComp extends Canvas implements VisComp float new_point = double_array [i].floatValue (); Float temp = (Float) plots_ [i].dequeue_tail (); plots_ [i].enqueue_head (new Float (new_point)); - + if (new_point > local_max_ [i]) { local_max_ [i] = new_point; local_max_values_ [local_max_value_index_ [i]] = local_max_ [i]; } - + if (monotonic_scale_) { float global_max = 0; @@ -185,7 +185,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp while (global_max > max_value_) max_value_ *= 2; - + while ((global_max < max_value_/2) && (max_value_ > old_max_value_)) max_value_ /= 2; } @@ -193,7 +193,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp { while (local_max_ [i] > max_value_) max_value_ *= 2; - + while ((local_max_ [i] < max_value_/2) && (max_value_ > old_max_value_)) max_value_ /= 2; } @@ -211,7 +211,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp FontMetrics fm = g.getFontMetrics (); int fheight = fm.getHeight (); String value = "Scale: " + max_value_ ; - + if ((offscreen_ == null) || (offscreensize_.width != d.width - 8) || (offscreensize_.height != d.height - 8)) @@ -226,10 +226,10 @@ public class MultiDoubleVisComp extends Canvas implements VisComp g.draw3DRect (0, 0, d.width - 1, d.height - 1, true); g.draw3DRect (1, 1, d.width - 3, d.height - 3, true); g.draw3DRect (2, 2, d.width - 5, d.height - 5, true); - + offgraphics_.setColor (getBackground ()); offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height); - offgraphics_.setColor (getForeground ()); + offgraphics_.setColor (getForeground ()); offgraphics_.drawString (title_, 5, fheight); offgraphics_.drawString (value, 5, offscreensize_.height - 5); @@ -242,13 +242,13 @@ public class MultiDoubleVisComp extends Canvas implements VisComp while (queue_iter.hasMoreElements ()) { value_2 = ((Float) queue_iter.nextElement ()).floatValue (); - + if (value_1 > local_max_ [i]) local_max_ [i] = value_1; - + y1 = normalize (offscreensize_.height - fheight, value_1, i); y2 = normalize (offscreensize_.height - fheight, value_2, i); - + tmp = value_2; value_2 = value_1; value_1 = tmp; @@ -265,7 +265,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp g.drawImage (offscreen_, 3, 3, null); } - + public void paint (Graphics g) { Dimension d = getSize (); @@ -274,7 +274,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp { int plot_length = plots_ [i].length (); int num_points = d.width / spacing_; - + if (plots_[i].length () < num_points) { for (int j = 0; j < num_points - plot_length; j++) @@ -309,7 +309,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp if (new_count > plot_count_) { // New larger static global array of all local maxima values - float local_max_values_temp [] = + float local_max_values_temp [] = new float [local_max_value_count_ + new_count - plot_count_]; // Copy the previously stored maxima (if any) into the new array. @@ -365,7 +365,7 @@ public class MultiDoubleVisComp extends Canvas implements VisComp // Then, subtract the pixel location float location = (float) height - pixels; - + return Math.round (location); } } diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java index 7ef862e3aea..9a675d22333 100644 --- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java +++ b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java @@ -1,8 +1,8 @@ -// $Id$ +// $Id$ // ============================================================================ // -// +// // = FILENAME // NS_Resolve.java // @@ -14,7 +14,7 @@ // = DESCRIPTION // Resolves the initial reference to the Naming service, // the orb has to be given as a parameter to the -// resolve_name_service call. +// resolve_name_service call. // // ============================================================================ @@ -79,7 +79,7 @@ public class NS_Resolve // Wait 3 seconds for the Naming Service to connect listenSocket.setSoTimeout(3000); replySocket = listenSocket.accept(); - + // @@ The restriction right now is that the length of the IOR cannot be longer than 4096 char[] reply = new char[4096]; @@ -91,14 +91,14 @@ public class NS_Resolve { int c = in.read(); - if (c == -1) + if (c == -1) { throw new IOException("Unexpected EOF."); } reply[ length ] = (char) c; - - if (c == 0) + + if (c == 0) { break; } @@ -114,36 +114,36 @@ public class NS_Resolve catch (java.io.InterruptedIOException e) { System.err.println ("NS_Resolve: The receive lasted too long"); - } - catch(org.omg.CORBA.SystemException e) + } + catch(org.omg.CORBA.SystemException e) { System.err.println(e); - } + } catch (java.io.IOException e) { System.err.println (e); } - finally + finally { // Close the sockets. - if (sendSocket != null) + if (sendSocket != null) { sendSocket.close(); } - if (listenSocket != null) + if (listenSocket != null) { - try + try { listenSocket.close(); } catch (IOException e) {} } - if (replySocket != null) + if (replySocket != null) { - try + try { replySocket.close(); } @@ -152,5 +152,5 @@ public class NS_Resolve } return null; - } + } } diff --git a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java b/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java index 0e323279598..922ae739cd1 100644 --- a/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java +++ b/TAO/examples/Simulator/DOVEBrowser/NavWeapDataHandler.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // NavWeapDataHandler.java // @@ -8,7 +8,7 @@ // // = DESCRIPTION // This is an implementation of the interface Data Handler, -// it handles Navigation and Weapons data, where statistic data is +// it handles Navigation and Weapons data, where statistic data is // part of it. Several Observables are declared, they can be accessed by // any number of Observers, which could reside in a Java Bean for example. // @@ -18,18 +18,18 @@ import org.omg.CORBA.*; public class NavWeapDataHandler implements DataHandler { - java.util.Hashtable ObservablesTable; + java.util.Hashtable ObservablesTable; int received_events_; // Observable for Persian Recursion data class PersianObservable extends DemoObservable { - + // to ask which kind of viewer is needed to display data public int getProperty () { return Properties.PERSIAN; } - + public void updatePersianData (PersianRecursion.Data data) { // System.out.println ("in PersianObservable.updatePersianData"); @@ -42,20 +42,20 @@ public class NavWeapDataHandler implements DataHandler { // Observable for Navigation data class NavigationObservable extends DemoObservable { - + // to ask which kind of viewer is needed to display data public int getProperty () { return Properties.NAVIGATION; - } - + } + public void updateNavigation (Navigation navigation) { setChanged (); notifyObservers (navigation); - } + } } class WeaponsObservable extends DemoObservable { - + // to ask which kind of viewer is needed to display data public int getProperty () { return Properties.WEAPONS; @@ -66,13 +66,13 @@ public class NavWeapDataHandler implements DataHandler { notifyObservers (weapons); } } - + class Cpu_UsageObservable extends DemoObservable { - + public int getProperty () { return Properties.DOUBLE; } - + public void updateCpu_Usage (double utilization) { setChanged (); Double temp_ = new Double (utilization); @@ -81,7 +81,7 @@ public class NavWeapDataHandler implements DataHandler { } class OverheadObservable extends DemoObservable { - + public int getProperty () { return Properties.DOUBLE; } @@ -97,11 +97,11 @@ public class NavWeapDataHandler implements DataHandler { double latency = 0.0; double avg_latency = 0.0; double sample_count = 0.0; - + public int getProperty () { return Properties.DOUBLE; } - + public void updateJitter (long completion_time, long computation_time, long arrival_time) { @@ -112,10 +112,10 @@ public class NavWeapDataHandler implements DataHandler { latency = latency > 0 ? latency : 0; sample_count = sample_count + 1.0; - avg_latency = (avg_latency * (sample_count - 1.0) + latency) / - (sample_count); + avg_latency = (avg_latency * (sample_count - 1.0) + latency) / + (sample_count); - double jitter_ = (double)Math.abs(latency - avg_latency); + double jitter_ = (double)Math.abs(latency - avg_latency); setChanged (); Double temp_ = new Double (jitter_); @@ -124,28 +124,28 @@ public class NavWeapDataHandler implements DataHandler { } class DeadlinesObservable extends DemoObservable { - + public int getProperty () { return Properties.DOUBLE; } - - public void updateDeadlines (long deadline_time, + + public void updateDeadlines (long deadline_time, long completion_time) { double missed_ = (deadline_time < completion_time) ? 1.0 : 0.0; Double temp_ = new Double (missed_); setChanged (); - notifyObservers (temp_); + notifyObservers (temp_); } } class CriticalDeadlinesObservable extends DeadlinesObservable { - + public int getProperty () { return Properties.DOUBLE; } - - public void updateDeadlines (long deadline_time, + + public void updateDeadlines (long deadline_time, long completion_time, long criticality) { @@ -153,14 +153,14 @@ public class NavWeapDataHandler implements DataHandler { (deadline_time < completion_time)) ? 1.0 : 0.0; Double temp_ = new Double (missed_); setChanged (); - notifyObservers (temp_); + notifyObservers (temp_); } } class LatencyObservable extends DemoObservable { double latency = 0.0; double last_latency = 0.0; - + public int getProperty () { return Properties.DOUBLE; } @@ -169,12 +169,12 @@ public class NavWeapDataHandler implements DataHandler { last_latency = latency; latency = (double)(computation_time); latency = latency > 0 ? latency : 0; - + setChanged (); Double temp_ = new Double(latency); - notifyObservers (temp_); + notifyObservers (temp_); } - + public void updateLatency (long completion_time, long computation_time, long arrival_time) { @@ -183,14 +183,14 @@ public class NavWeapDataHandler implements DataHandler { (double)(computation_time) - (double)(arrival_time); latency = latency > 0 ? latency : 0; - + setChanged (); Double temp_ = new Double(latency); - notifyObservers (temp_); + notifyObservers (temp_); } } - - + + public synchronized void update (RtecEventComm.Event event) { // System.out.println ("in NavWeapDataHandler.update"); @@ -206,7 +206,7 @@ public class NavWeapDataHandler implements DataHandler { try { - persian_recursion_data = + persian_recursion_data = PersianRecursion.DataHelper.extract (any_value); } catch (Exception e) @@ -231,7 +231,7 @@ public class NavWeapDataHandler implements DataHandler { pobs_hi.updatePersianData (persian_recursion_data); - // LatencyObservable lobs_hi = + // LatencyObservable lobs_hi = // (LatencyObservable) ObservablesTable.get ("High Consumer Execution Time (100 ns)"); // lobs_hi.updateLatency (persian_recursion_data.computation_time); @@ -249,7 +249,7 @@ public class NavWeapDataHandler implements DataHandler { // System.out.println ("updated low priority persian recursion observable"); - // LatencyObservable lobs_lo = + // LatencyObservable lobs_lo = // (LatencyObservable) ObservablesTable.get ("Low Consumer Execution Time (100 ns)"); // lobs_lo.updateLatency (persian_recursion_data.computation_time); @@ -291,7 +291,7 @@ public class NavWeapDataHandler implements DataHandler { DeadlinesObservable dobs = (DeadlinesObservable)ObservablesTable.get ("Missed Deadlines"); dobs.updateDeadlines (navigation_.deadline_time, navigation_.completion_time); - CriticalDeadlinesObservable cdobs = + CriticalDeadlinesObservable cdobs = (CriticalDeadlinesObservable)ObservablesTable.get ("Missed Critical Deadlines"); cdobs.updateDeadlines (navigation_.deadline_time, navigation_.completion_time, @@ -310,7 +310,7 @@ public class NavWeapDataHandler implements DataHandler { { Weapons weapons_ = WeaponsHelper.extract (any_value); - // if the weapons structure's update data flag is set, update + // if the weapons structure's update data flag is set, update // itss scheduling data with actual values from the EC if (weapons_.update_data > 0) { @@ -350,13 +350,13 @@ public class NavWeapDataHandler implements DataHandler { weapons_.arrival_time); received_events_++; } - else + else { System.out.println ("Received wrong type information"); - + System.out.println ("Received any_value.type (): [" + any_value.type() + "]"); - + System.out.println ("Expected NavigationHelper.type (): [" + NavigationHelper.type() + "]"); @@ -367,7 +367,7 @@ public class NavWeapDataHandler implements DataHandler { PersianRecursion.DataHelper.type() + "]"); } } - + NavWeapDataHandler () { ObservablesTable = new java.util.Hashtable(); @@ -381,27 +381,27 @@ public class NavWeapDataHandler implements DataHandler { ObservablesTable.put ("Missed Deadlines", new DeadlinesObservable()); ObservablesTable.put ("Missed Critical Deadlines", new CriticalDeadlinesObservable()); ObservablesTable.put ("Latency (100 ns)", new LatencyObservable()); - ObservablesTable.put ("Weapons Latency (100 ns)", new LatencyObservable()); - ObservablesTable.put ("Navigation Latency (100 ns)", new LatencyObservable()); - ObservablesTable.put ("High Consumer Persian Recursion", new PersianObservable()); - ObservablesTable.put ("Low Consumer Persian Recursion", new PersianObservable()); - ObservablesTable.put ("High Consumer Execution Time (100 ns)", new LatencyObservable()); - ObservablesTable.put ("Low Consumer Execution Time (100 ns)", new LatencyObservable()); + ObservablesTable.put ("Weapons Latency (100 ns)", new LatencyObservable()); + ObservablesTable.put ("Navigation Latency (100 ns)", new LatencyObservable()); + ObservablesTable.put ("High Consumer Persian Recursion", new PersianObservable()); + ObservablesTable.put ("Low Consumer Persian Recursion", new PersianObservable()); + ObservablesTable.put ("High Consumer Execution Time (100 ns)", new LatencyObservable()); + ObservablesTable.put ("Low Consumer Execution Time (100 ns)", new LatencyObservable()); } - + public java.util.Enumeration getObservablesList () { return ObservablesTable.keys (); } - + public DemoObservable getObservable(String name) { return (DemoObservable)ObservablesTable.get (name); } - + public int getObservableProperty (String name) { DemoObservable obs = (DemoObservable)ObservablesTable.get (name); return obs.getProperty (); } } - - + + diff --git a/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java b/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java index 3d7a217389b..a602945b50b 100644 --- a/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/NavigationVisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // NavigationVisComp.java // @@ -35,40 +35,40 @@ public class NavigationVisComp extends Panel implements VisComp public int getProperty () { return Properties.NAVIGATION; } - + public void update (java.util.Observable observable, java.lang.Object obj) { Navigation navigation_ = null; try { - navigation_ = (Navigation) obj; + navigation_ = (Navigation) obj; } catch (Exception excp) { System.out.println (excp); System.out.println ("Visualization Component received wrong data type!"); } - if (navigation_ != null) { + if (navigation_ != null) { // make sure all the values are in the proper range. - navigation_.roll = (navigation_.roll > 180 || navigation_.roll < -180) ? + navigation_.roll = (navigation_.roll > 180 || navigation_.roll < -180) ? 0 : navigation_.roll; - navigation_.pitch = (navigation_.pitch > 90 || navigation_.pitch < -90) ? + navigation_.pitch = (navigation_.pitch > 90 || navigation_.pitch < -90) ? 0 : navigation_.pitch; // update the artificial horizon alt_hor_.update_display (navigation_.roll, navigation_.pitch); - navigation_.pitch = (navigation_.position_latitude > 90 || navigation_.position_latitude < -90) ? + navigation_.pitch = (navigation_.position_latitude > 90 || navigation_.position_latitude < -90) ? 0 : navigation_.position_latitude; - navigation_.pitch = (navigation_.position_longitude > 100 || navigation_.position_longitude < 00) ? + navigation_.pitch = (navigation_.position_longitude > 100 || navigation_.position_longitude < 00) ? 0 : navigation_.position_longitude; - navigation_.pitch = (navigation_.altitude > 90 || navigation_.altitude < -90) ? + navigation_.pitch = (navigation_.altitude > 90 || navigation_.altitude < -90) ? 0 : navigation_.altitude; - navigation_.pitch = (navigation_.heading > 180 || navigation_.heading < -180) ? + navigation_.pitch = (navigation_.heading > 180 || navigation_.heading < -180) ? 0 : navigation_.heading; // update the position display - pos_.update_display (navigation_.position_latitude, - navigation_.position_longitude, - navigation_.altitude, - navigation_.heading); + pos_.update_display (navigation_.position_latitude, + navigation_.position_longitude, + navigation_.altitude, + navigation_.heading); } } } @@ -78,13 +78,13 @@ extends Canvas { private final static Color GREEN = new Color (0, 100, 0), BLUE = new Color (30, 144, 255); - + private Graphics offgraphics_; private Image offscreen_; private Dimension offscreensize_; private int roll_ = 0, pitch_ = 0; - + public void update_display (int roll, int pitch) { roll_ = roll; @@ -92,7 +92,7 @@ extends Canvas repaint (); } - + public Dimension getPreferredSize () { return new Dimension (180, 180); @@ -102,18 +102,18 @@ extends Canvas { return new Dimension (80, 80); } - + public void paint (Graphics g) { update (g); } - + public void update (Graphics g) { Dimension d = getSize (); int rad, angles[] = { 180, 0 }; Point center; - + if ((offscreen_ == null) || (d.width != offscreensize_.width) || (d.height != offscreensize_.height)) { @@ -121,17 +121,17 @@ extends Canvas offscreensize_ = new Dimension (d.width, d.height); offgraphics_ = offscreen_.getGraphics (); offgraphics_.setFont (getFont()); - + // g.setColor (Color.lightGray); // g.draw3DRect (0, 0, d.width - 1, d.height - 1, true); // g.draw3DRect (1, 1, d.width - 3, d.height - 3, true); // g.draw3DRect (2, 2, d.width - 5, d.height - 5, true); } - + offgraphics_.setColor (getBackground()); offgraphics_.fillRect (0, 0, d.width, d.height); offgraphics_.setColor (BLUE); - + // Calculate from the dimensions, the largest square. center = new Point (d.width / 2, d.height / 2); rad = ((center.x < center.y) ? center.x : center.y); @@ -151,7 +151,7 @@ extends Canvas // Draw the resulting terrain draw_horizon (rad, center, angles); - // Draw the plotted Image. + // Draw the plotted Image. g.drawImage (offscreen_, 0, 0, null); } @@ -162,7 +162,7 @@ extends Canvas ((angles[0] > angles[1]) ? (360 - angles[0]) + angles[1] : (angles[1] - angles[0])); - + Polygon remainder = new Polygon (); offgraphics_.setColor (GREEN); @@ -181,9 +181,9 @@ extends Canvas // System.out.println (points[0] + " " + points[1]); // System.out.println (accepted_point); - + remainder.addPoint (center.x + polar_to_rect_x (rad, cover_angle), - center.y - polar_to_rect_y (rad, cover_angle)); + center.y - polar_to_rect_y (rad, cover_angle)); remainder.addPoint (center.x + polar_to_rect_x (rad, angles[0]), center.y - polar_to_rect_y (rad, angles[0])); remainder.addPoint (center.x + polar_to_rect_x (rad, angles[1]), @@ -191,9 +191,9 @@ extends Canvas offgraphics_.fillPolygon (remainder); //offgraphics_.setColor (getBackground ()); //offgraphics_.drawPolygon (remainder); - } + } } - + private void pitch_horizon (int rad, int[] angles) { boolean upside_down = Math.abs (roll_) >= 90; @@ -203,10 +203,10 @@ extends Canvas angles[0] += angle_shift; angles[1] -= angle_shift; - + } - + private void roll_horizon (int rad, int[] angles) { // Roll the left and right points of the terrain. @@ -217,7 +217,7 @@ extends Canvas angles[0] += 360; if (angles[1] < 0) - angles[1] += 360; + angles[1] += 360; } private int polar_to_rect_x (int rad, int angle) @@ -239,7 +239,7 @@ extends Canvas return ((double) (y2 - y1)) / ((double) (x2 - x1)); } - + private Point[] line_circle_intesect (int rad, double y_intercept, double slope) { double r_2 = (double)(rad * rad), @@ -257,7 +257,7 @@ extends Canvas return points; } - + private int calculate_angle (int rad, int x, int y) { /* @@ -293,7 +293,7 @@ extends Canvas { int[] roots = new int [2]; double body = Math.sqrt (b*b - 4.0*a*c); - + roots[0] = (int) Math.round ((-b + body) / (2.0 * a)); roots[1] = (int) Math.round ((-b - body) / (2.0 * a)); @@ -312,17 +312,17 @@ extends Canvas class Position extends Panel { private final static Font FONT = new Font ("Dialog", Font.BOLD, 12); - private final static char DEGREE = '\u00B0'; - + private final static char DEGREE = '\u00B0'; + private Label lat_ = new Label ("0" + DEGREE + " N", Label.RIGHT), long_ = new Label ("0" + DEGREE + " S", Label.RIGHT), alt_ = new Label ("0 Kft", Label.RIGHT), heading_ = new Label ("0" + DEGREE + " ", Label.RIGHT); - + public Position () { Panel grid_panel = new Panel (); - + lat_.setFont (FONT); long_.setFont (FONT); alt_.setFont (FONT); @@ -332,7 +332,7 @@ class Position extends Panel add (lat_); add (long_); add (heading_); - add (alt_); + add (alt_); } public void update_display (int lat, int lon, int alt, int heading) diff --git a/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java b/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java index 2ea856c24e2..b00b798c497 100644 --- a/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java +++ b/TAO/examples/Simulator/DOVEBrowser/ObservablesDialog.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // ObservablesDialog.java // @@ -21,7 +21,7 @@ public class ObservablesDialog extends Dialog { AnswerListener listener_; ObservablesDialog (DemoCore parent,java.util.Enumeration enumeration) { - + super ((Frame)parent, "Select Observables", true); parent_ = parent; this.setSize(400, 300); @@ -32,7 +32,7 @@ public class ObservablesDialog extends Dialog { list_.setSize (200,200); for (; enumeration.hasMoreElements();) { - list_.add ((String)enumeration.nextElement()); + list_.add ((String)enumeration.nextElement()); } @@ -46,17 +46,17 @@ public class ObservablesDialog extends Dialog { constraints_.fill = GridBagConstraints.BOTH; this.setLayout (gridbag_); - + constraints_.weightx = 1.0; constraints_.weighty = 1.0; constraints_.gridwidth = GridBagConstraints.REMAINDER; gridbag_.setConstraints (list_, constraints_); this.add (list_); - + constraints_.weightx = 1.0; constraints_.weighty = 1.0; constraints_.gridwidth = GridBagConstraints.RELATIVE; - constraints_.fill = GridBagConstraints.NONE; + constraints_.fill = GridBagConstraints.NONE; gridbag_.setConstraints (ok_button_, constraints_); gridbag_.setConstraints (cancel_button_, constraints_); this.add (ok_button_); @@ -68,7 +68,7 @@ public class ObservablesDialog extends Dialog { String selected_ = ObservablesDialog.this.list_.getSelectedItem (); if (selected_ != null) { System.out.println (">>>>> " + selected_); - if (listener_ != null) { + if (listener_ != null) { AnswerEvent ev = new AnswerEvent (ObservablesDialog.this, selected_); listener_.ok (ev); } @@ -76,7 +76,7 @@ public class ObservablesDialog extends Dialog { } } }); - + cancel_button_.addActionListener (new ActionListener () { public void actionPerformed (ActionEvent e) { ObservablesDialog.this.setVisible (false); diff --git a/TAO/examples/Simulator/DOVEBrowser/PersianVisComp.java b/TAO/examples/Simulator/DOVEBrowser/PersianVisComp.java index bf29e9aaf19..e0ab6661507 100644 --- a/TAO/examples/Simulator/DOVEBrowser/PersianVisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/PersianVisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // PersianVisComp.java // @@ -113,7 +113,7 @@ public class PersianVisComp extends Canvas implements VisComp return new Dimension (PIXELS_WIDE + 2 * DRAW_OFFSET, PIXELS_WIDE + 2 * DRAW_OFFSET); } - + public String getName () { return title_; } @@ -122,7 +122,7 @@ public class PersianVisComp extends Canvas implements VisComp { PersianRecursion.Data data_temp_; try { - data_temp_ = (PersianRecursion.Data) obj; + data_temp_ = (PersianRecursion.Data) obj; } catch (Exception excp) { data_temp_ = null; @@ -170,7 +170,7 @@ public class PersianVisComp extends Canvas implements VisComp FontMetrics fm = g.getFontMetrics (); int x1 = d.width - 8, y1, x2, y2, fheight = fm.getHeight (), i; PersianRecursion.Data data_temp_; - + if ((offscreen_ == null) || (offscreensize_.width != d.width - 8) || (offscreensize_.height != d.height - 8)) @@ -185,10 +185,10 @@ public class PersianVisComp extends Canvas implements VisComp g.draw3DRect (0, 0, d.width - 1, d.height - 1, true); g.draw3DRect (1, 1, d.width - 3, d.height - 3, true); g.draw3DRect (2, 2, d.width - 5, d.height - 5, true); - + offgraphics_.setColor (getBackground ()); offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height); - offgraphics_.setColor (getForeground ()); + offgraphics_.setColor (getForeground ()); offgraphics_.drawString (title_, 5, fheight); Image img = createImage (image_source_); @@ -198,7 +198,7 @@ public class PersianVisComp extends Canvas implements VisComp // System.out.println ("updated."); } - + public void paint (Graphics g) { update (g); diff --git a/TAO/examples/Simulator/DOVEBrowser/Properties.java b/TAO/examples/Simulator/DOVEBrowser/Properties.java index 7f537b85e06..d954339e58d 100644 --- a/TAO/examples/Simulator/DOVEBrowser/Properties.java +++ b/TAO/examples/Simulator/DOVEBrowser/Properties.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // Properties.java // @@ -19,4 +19,4 @@ public class Properties { public static final int PERSIAN = 3; public static final int MULTIDOUBLE = 4; } - + diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java index a69f20038bb..6f2ccee6707 100644 --- a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java +++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java @@ -143,7 +143,7 @@ public class PushConsumer extends RtecEventComm.PushConsumerPOA suppliers_ = consumer_admin_.obtain_push_supplier (); org.omg.CORBA.Object objref = poa_.servant_to_reference (this); - RtecEventComm.PushConsumer consumer_ref = + RtecEventComm.PushConsumer consumer_ref = RtecEventComm.PushConsumerHelper.narrow (objref); suppliers_.connect_push_consumer (consumer_ref, qos); diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java index 5c1ce0d3894..34512f08b7a 100644 --- a/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java +++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumerFactory.java @@ -1,7 +1,7 @@ // $Id$ // // ============================================================================ -// +// // = FILENAME // PushConsumerFactory.java // @@ -34,18 +34,18 @@ public class PushConsumerFactory { private boolean use_queueing_ = false; - public PushConsumerFactory (DataHandler dataHandler, - String nameServiceIOR, - String nameServicePort, + public PushConsumerFactory (DataHandler dataHandler, + String nameServiceIOR, + String nameServicePort, String[] args, boolean use_queueing, java.applet.Applet applet) { - try + try { use_queueing_ = use_queueing; dataHandler_ = dataHandler; - + // if the DOVE Browser is running as an Applet if (applet != null) { orb_ = org.omg.CORBA.ORB.init (applet, null); @@ -53,27 +53,27 @@ public class PushConsumerFactory { else { // not running as an Applet, but as an normal Application orb_ = org.omg.CORBA.ORB.init (args, null); } - + System.out.println ("Initialized ORB"); - + org.omg.CORBA.Object obj = orb_.resolve_initial_references ("RootPOA"); System.out.println ("Obtained RootPOA"); poa_ = org.omg.PortableServer.POAHelper.narrow (obj); - + System.out.println ("Narrowed RootPOA"); // Get the Naming Service initial reference - + // Name Service Lookup cannot be used when running as an Applet if (nameServiceIOR == null && applet != null) { System.out.println (" Name Service Lookup cannot be used when running as an Applet! Quit!"); System.exit (1); } - - if (nameServiceIOR == null) { // only used when running via "java" or "vbj" + + if (nameServiceIOR == null) { // only used when running via "java" or "vbj" System.out.println ("Using the lookup protocol!"); NS_Resolve ns_resolve_ = new NS_Resolve (nameServicePort); naming_service_object_ = ns_resolve_.resolve_name_service (orb_); @@ -85,11 +85,11 @@ public class PushConsumerFactory { // Walk through args and count EC and Scheduling Service names. int arg_index = 0; - while (args.length > arg_index) + while (args.length > arg_index) { // Count an event service name - if ((args[arg_index].equals ("-eventservicename")) && - (args.length > arg_index + 1)) + if ((args[arg_index].equals ("-eventservicename")) && + (args.length > arg_index + 1)) { System.out.println ("switch [" + args[arg_index] + "]"); System.out.println ("value [" + args[arg_index + 1] + "]"); @@ -97,23 +97,23 @@ public class PushConsumerFactory { ++ec_names_count_; } // Count a scheduling service name - else if ((args[arg_index].equals ("-scheduleservicename")) && - (args.length > arg_index + 1)) + else if ((args[arg_index].equals ("-scheduleservicename")) && + (args.length > arg_index + 1)) { System.out.println ("switch [" + args[arg_index] + "]"); System.out.println ("value [" + args[arg_index + 1] + "]"); arg_index += 2; ++ss_names_count_; } - else if (args[arg_index].equals ("-dualECdemo")) + else if (args[arg_index].equals ("-dualECdemo")) { System.out.println ("switch [" + args[arg_index] + "]"); ++arg_index; ec_names_count_ += 2; ss_names_count_ += 2; } - else if ((args[arg_index].equals ("-dualECdemo1")) || - (args[arg_index].equals ("-dualECdemo2"))) + else if ((args[arg_index].equals ("-dualECdemo1")) || + (args[arg_index].equals ("-dualECdemo2"))) { System.out.println ("switch [" + args[arg_index] + "]"); ++arg_index; @@ -137,30 +137,30 @@ public class PushConsumerFactory { ss_names_ = new String [ss_names_count_]; } - // Then traverse the args again to allocate and fill in a list + // Then traverse the args again to allocate and fill in a list // of EC and Scheduling Service names. arg_index = 0; - ec_names_count_ = 0; - ss_names_count_ = 0; - while (args.length > arg_index) + ec_names_count_ = 0; + ss_names_count_ = 0; + while (args.length > arg_index) { // Set an event service name. - if ((args[arg_index].equals ("-eventservicename")) && - (args.length > arg_index + 1)) + if ((args[arg_index].equals ("-eventservicename")) && + (args.length > arg_index + 1)) { ec_names_[ec_names_count_] = args[arg_index + 1]; - ++ec_names_count_; + ++ec_names_count_; arg_index += 2; } // Set a schedule service name. - else if ((args[arg_index].equals ("-scheduleservicename")) && - (args.length > arg_index + 1)) + else if ((args[arg_index].equals ("-scheduleservicename")) && + (args.length > arg_index + 1)) { ss_names_[ss_names_count_] = args[arg_index + 1]; - ++ss_names_count_; + ++ss_names_count_; arg_index += 2; } - else if (args[arg_index].equals ("-dualECdemo")) + else if (args[arg_index].equals ("-dualECdemo")) { ss_names_[ss_names_count_] = "DUAL_SCHED_HI"; ss_names_[ss_names_count_ + 1] = "DUAL_SCHED_LO"; @@ -170,7 +170,7 @@ public class PushConsumerFactory { ec_names_count_ += 2; ss_names_count_ += 2; } - else if (args[arg_index].equals ("-dualECdemo1")) + else if (args[arg_index].equals ("-dualECdemo1")) { ss_names_[ss_names_count_] = "DUAL_SCHED_HI"; ec_names_[ec_names_count_] = "DUAL_EC_HI"; @@ -178,7 +178,7 @@ public class PushConsumerFactory { ++ec_names_count_; ++ss_names_count_; } - else if (args[arg_index].equals ("-dualECdemo2")) + else if (args[arg_index].equals ("-dualECdemo2")) { ss_names_[ss_names_count_] = "DUAL_SCHED_LO"; ec_names_[ec_names_count_] = "DUAL_EC_LO"; @@ -207,7 +207,7 @@ public class PushConsumerFactory { ss_names_ = new String [1]; ss_names_ [0] = "ScheduleService"; } - } + } catch (org.omg.CORBA.ORBPackage.InvalidName e) { System.err.println ("CosNaming.NamingContextPackage.InvalidName"); @@ -216,28 +216,28 @@ public class PushConsumerFactory { catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization"); System.err.println(e); - } - + } + } - - public class Object_is_null_exception extends Exception + + public class Object_is_null_exception extends Exception { Object_is_null_exception (String s) { super (s); } } - + public void run () { try { - + // Get the Naming Context to allow resolving the EventService and // ScheduleService - CosNaming.NamingContext naming_context_ = + CosNaming.NamingContext naming_context_ = CosNaming.NamingContextHelper.narrow (naming_service_object_); - + if (naming_context_ == null) { System.err.println ("The Naming Context is null"); @@ -245,7 +245,7 @@ public class PushConsumerFactory { } System.out.println ("Reference to the Naming Service is ok."); - // Create Consumers connected to the EventService + // Create Consumers connected to the EventService int ss_number = 0; RtecScheduler.Scheduler scheduler_ = null; for (int ec_number = 0; ec_number < ec_names_count_; ++ec_number) @@ -256,24 +256,24 @@ public class PushConsumerFactory { { CosNaming.NameComponent[] ss_name_components_ = new CosNaming.NameComponent[1]; ss_name_components_[0] = new CosNaming.NameComponent (ss_names_[ss_number],""); - org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (ss_name_components_); - + org.omg.CORBA.Object scheduler_object_ = naming_context_.resolve (ss_name_components_); + if (scheduler_object_ == null) { throw new Object_is_null_exception(ss_names_[ss_number] + " Object is null"); } - + scheduler_ = RtecScheduler.SchedulerHelper.narrow (scheduler_object_); if (scheduler_ == null) { - throw new Object_is_null_exception(ss_names_[ss_number] + + throw new Object_is_null_exception(ss_names_[ss_number] + " narrowed ref is null"); } - System.out.println ("Reference to " + - ss_names_[ss_number] + " is ok."); + System.out.println ("Reference to " + + ss_names_[ss_number] + " is ok."); ++ss_number; } @@ -286,44 +286,44 @@ public class PushConsumerFactory { if (event_channel_object_ == null) { - throw new Object_is_null_exception(ec_names_[ec_number] + + throw new Object_is_null_exception(ec_names_[ec_number] + " Object is null"); } - RtecEventChannelAdmin.EventChannel event_channel_ = + RtecEventChannelAdmin.EventChannel event_channel_ = RtecEventChannelAdmin.EventChannelHelper.narrow (event_channel_object_); if (event_channel_ == null) { - throw new Object_is_null_exception(ec_names_[ec_number] + + throw new Object_is_null_exception(ec_names_[ec_number] + " narrowed ref is null"); } - - System.out.println ("Reference to " + - ec_names_[ec_number] + " is ok."); - + + System.out.println ("Reference to " + + ec_names_[ec_number] + " is ok."); + // Start the consumer System.out.println ("Instantiating the Push Consumer for " + ec_names_[ec_number] + ": demo_consumer_" + ec_number + "."); - PushConsumer pushConsumer_ = new PushConsumer (orb_, poa_, + PushConsumer pushConsumer_ = new PushConsumer (orb_, poa_, dataHandler_, use_queueing_); System.out.println ("Initializing the Push Consumer for " + ec_names_[ec_number] + ": demo_consumer_" + ec_number + "."); - pushConsumer_.open_consumer (event_channel_, scheduler_, + pushConsumer_.open_consumer (event_channel_, scheduler_, "demo_consumer_" + ec_number); } - + // Tell the CORBA environment that we are ready - - System.out.println ("PushConsumer registered with POA"); + + System.out.println ("PushConsumer registered with POA"); poa_.the_POAManager ().activate (); - System.out.println ("POA Activated"); + System.out.println ("POA Activated"); } catch (CosNaming.NamingContextPackage.CannotProceed e) { @@ -339,7 +339,7 @@ public class PushConsumerFactory { { System.err.println ("CosNaming.NamingContextPackage.NotFound"); System.err.println (e); - + } catch (org.omg.PortableServer.POAManagerPackage.AdapterInactive e) { @@ -350,14 +350,14 @@ public class PushConsumerFactory { { System.err.println (e); } - catch(org.omg.CORBA.SystemException e) + catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory.run: Failure"); System.err.println(e); - } + } } - + } // public class PushConsumerFactory diff --git a/TAO/examples/Simulator/DOVEBrowser/Queue.java b/TAO/examples/Simulator/DOVEBrowser/Queue.java index 7ffaba15c52..59e552dbe46 100644 --- a/TAO/examples/Simulator/DOVEBrowser/Queue.java +++ b/TAO/examples/Simulator/DOVEBrowser/Queue.java @@ -8,11 +8,11 @@ public class Queue // Friendly? Queue_Node head_ = null; Queue_Node tail_ = null; - + private int length_ = 0; - + public Queue() - { + { } public Enumeration forward_iterator() @@ -24,7 +24,7 @@ public class Queue { return new Queue_Iterator(this, Queue_Iterator.REVERSE); } - + public void enqueue_tail(Object new_data) { Queue_Node new_node = new Queue_Node(new_data); @@ -47,7 +47,7 @@ public class Queue public void enqueue_head(Object new_data) { Queue_Node new_node = new Queue_Node(new_data); - + if (head_ == null) { tail_ = new_node; @@ -62,11 +62,11 @@ public class Queue length_++; } - + public Object dequeue_head() { Object return_value = null; - + if (head_ == null) return_value = null; else if (tail_ == head_) @@ -79,18 +79,18 @@ public class Queue { return_value = head_.data_; head_ = head_.next_; - head_.prev_ = null; + head_.prev_ = null; } length_--; return return_value; } - + public Object dequeue_tail() { Object return_value = null; - + if (tail_ == null) return_value = null; else if (tail_ == head_) @@ -100,10 +100,10 @@ public class Queue head_ = null; } else - { + { return_value = tail_.data_; tail_ = tail_.prev_; - tail_.next_ = null; + tail_.next_ = null; } length_--; @@ -149,11 +149,11 @@ class Queue_Iterator implements Enumeration { public static final boolean FORWARD = true; public static final boolean REVERSE = false; - + private Queue queue_; private Queue_Node queue_ptr_; private boolean direction_ = FORWARD; - + public Queue_Iterator(Queue queue) { queue_ = queue; @@ -174,7 +174,7 @@ class Queue_Iterator implements Enumeration public Object nextElement() { Object data = queue_ptr_.data_; - + if (direction_) queue_ptr_ = queue_ptr_.next_; else diff --git a/TAO/examples/Simulator/DOVEBrowser/VisComp.java b/TAO/examples/Simulator/DOVEBrowser/VisComp.java index 53294f33ea2..c038286a40a 100644 --- a/TAO/examples/Simulator/DOVEBrowser/VisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/VisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // VisComp.java // diff --git a/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java b/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java index b35eccc67a7..c992582277f 100644 --- a/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java +++ b/TAO/examples/Simulator/DOVEBrowser/VisCompFactory.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // VisCompFactory.java // @@ -12,12 +12,12 @@ // ============================================================================ import java.beans.*; - + class VisCompFactory { - VisComp getNewVisComp (int property, String name) { - - ClassLoader classLoader_ = this.getClass().getClassLoader(); + VisComp getNewVisComp (int property, String name) { + + ClassLoader classLoader_ = this.getClass().getClassLoader(); VisComp visComp_ = null; String visCompName_ = "VisComp"; diff --git a/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java b/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java index 8c81bfc9c11..ef343784cf1 100644 --- a/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java +++ b/TAO/examples/Simulator/DOVEBrowser/WeaponsVisComp.java @@ -1,5 +1,5 @@ // $Id$ -// +// // = FILENAME // WeaponsVisComp.java // @@ -57,7 +57,7 @@ public class WeaponsVisComp extends Panel implements VisComp public int getProperty () { return Properties.WEAPONS; } - + public Dimension getPreferredSize () { return new Dimension (250, 200); } @@ -65,18 +65,18 @@ public class WeaponsVisComp extends Panel implements VisComp public Dimension getMinimumSize () { return new Dimension (80, 80); } - + public void update (java.util.Observable observable, java.lang.Object obj) { Weapons weapons_ = null; try { - weapons_ = (Weapons) obj; + weapons_ = (Weapons) obj; } catch (Exception excp) { System.out.println (excp); System.out.println ("Visualization Component received wrong data type!"); } if (weapons_ != null) - { + { for (int i = 0; i < weapons_.number_of_weapons && i < 5; i++) { String weapon = ""; @@ -85,19 +85,19 @@ public class WeaponsVisComp extends Panel implements VisComp { default: break; - case 0: weapon = weapons_.weapon1_identifier; + case 0: weapon = weapons_.weapon1_identifier; status = weapons_.weapon1_status; break; - case 1: weapon = weapons_.weapon2_identifier; + case 1: weapon = weapons_.weapon2_identifier; status = weapons_.weapon2_status; break; - case 2: weapon = weapons_.weapon3_identifier; + case 2: weapon = weapons_.weapon3_identifier; status = weapons_.weapon3_status; break; - case 3: weapon = weapons_.weapon4_identifier; + case 3: weapon = weapons_.weapon4_identifier; status = weapons_.weapon4_status; break; - case 4: weapon = weapons_.weapon5_identifier; + case 4: weapon = weapons_.weapon5_identifier; status = weapons_.weapon5_status; break; } @@ -108,7 +108,7 @@ public class WeaponsVisComp extends Panel implements VisComp if (status_label_ != null) status_label_.setText ((status == 1) ? ONLINE : OFFLINE); else - { + { if (count_ == 0) this.removeAll (); @@ -119,7 +119,7 @@ public class WeaponsVisComp extends Panel implements VisComp status_label_.setFont (FONT_SMALL); weapon_label_.setFont (FONT_SMALL); weapon_label_.setForeground (BLUE); - + gbc_.gridx = 0; gbc_.anchor = GridBagConstraints.WEST; gbl_.setConstraints (weapon_label_, gbc_); @@ -128,7 +128,7 @@ public class WeaponsVisComp extends Panel implements VisComp gbc_.anchor = GridBagConstraints.EAST; gbl_.setConstraints (status_label_, gbc_); add (status_label_); - + gbc_.gridy++; weapons_table_.put (weapon, status_label_); } diff --git a/TAO/examples/Simulator/Persian.idl b/TAO/examples/Simulator/Persian.idl index 014dcbb9d4b..cca3dfb14d8 100644 --- a/TAO/examples/Simulator/Persian.idl +++ b/TAO/examples/Simulator/Persian.idl @@ -2,7 +2,7 @@ // =========================================================================== // -// = FILE +// = FILE // Persian.idl // // = DESCRIPTION @@ -56,7 +56,7 @@ module PersianRecursion // = DESCRIPTION // This interface specifies a single operation, used // to shut down the orb. This allows the orb to - // be shut down cleanly, from within a synchronously + // be shut down cleanly, from within a synchronously // servant dispatched servant, but with the request // originating from another thread. { diff --git a/TAO/examples/ior_corbaloc/corbaloc.idl b/TAO/examples/ior_corbaloc/corbaloc.idl index 296ae9adde0..968fb66e80e 100644 --- a/TAO/examples/ior_corbaloc/corbaloc.idl +++ b/TAO/examples/ior_corbaloc/corbaloc.idl @@ -2,20 +2,20 @@ module corbaloc { - + interface Status { // = TITLE - // A simple interface to check the status of + // A simple interface to check the status of // connection between the client and the server. // // = DESCRIPTION // Prints out the status. boolean print_status (); - // Return <true == 0> if the server received the + // Return <true == 0> if the server received the // request from the client. - + }; }; diff --git a/TAO/examples/mfc/MainFrm.cpp b/TAO/examples/mfc/MainFrm.cpp index 180a783ad6e..2e4f4e1db01 100644 --- a/TAO/examples/mfc/MainFrm.cpp +++ b/TAO/examples/mfc/MainFrm.cpp @@ -61,7 +61,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) return -1; // fail to create } - if (!m_wndStatusBar.Create(this) || + if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators, sizeof(indicators)/sizeof(UINT))) { diff --git a/TAO/examples/mfc/w32_test_impl.cpp b/TAO/examples/mfc/w32_test_impl.cpp index f9a745539f5..0deb96a2837 100644 --- a/TAO/examples/mfc/w32_test_impl.cpp +++ b/TAO/examples/mfc/w32_test_impl.cpp @@ -24,10 +24,10 @@ W32_Test_Impl::getresponse (CORBA::Long respnr) case 1: myreturn = CORBA::string_dup ("Parameter 1"); break; - case 2: + case 2: myreturn = CORBA::string_dup ("Parameter 2"); break; - default: + default: myreturn = CORBA::string_dup ("Parameter unknown!"); break; } diff --git a/TAO/interop-tests/wchar/WChar_PasserImpl.java b/TAO/interop-tests/wchar/WChar_PasserImpl.java index ee3086bfa1b..497bb2a6c17 100644 --- a/TAO/interop-tests/wchar/WChar_PasserImpl.java +++ b/TAO/interop-tests/wchar/WChar_PasserImpl.java @@ -89,10 +89,10 @@ public class WChar_PasserImpl System.out.println ("wstructseq_to_server FAILED entry " + i); result = false; } - } + } return result; } - + public wstruct[] wstructseq_from_server (short key) { wstruct[] wsList = new wstruct[5]; @@ -174,10 +174,10 @@ public class WChar_PasserImpl result.st_array = ref.get_warray(key); result.st_any = orb.create_any(); result.st_any.insert_wstring(ref.get_wstring(key)); - + return result; } - + // TODO: this should have a home where it's accessable to both // client & server, but it doesn't belong in WCharReference public boolean match_wstruct (short key, wstruct test ) diff --git a/TAO/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp index 084ad7a8083..b7cb03a4ab6 100644 --- a/TAO/interop-tests/wchar/server.cpp +++ b/TAO/interop-tests/wchar/server.cpp @@ -79,7 +79,7 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] ) try { // Initialize orb - CORBA::ORB_var orb = + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv); if (parse_args(argc, argv)) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl index 42b003b39c0..4b976483bd1 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl @@ -100,7 +100,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) { exit 1; } -# start EchoEventSupplier +# start EchoEventSupplier $S_status = $S->Spawn (); if ($S_status != 0) { @@ -108,7 +108,7 @@ if ($S_status != 0) { exit 1; } -# start EchoEventConsumer +# start EchoEventConsumer $C_status = $C->Spawn (); if ($C_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl index d58b9480936..02f275bebc3 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl @@ -67,7 +67,7 @@ if ($c->PutFile ($iorfile) == -1) { } -# start EchoEventSupplier +# start EchoEventSupplier $S_status = $S->Spawn (); if ($S_status != 0) { @@ -75,7 +75,7 @@ if ($S_status != 0) { exit 1; } -# start EchoEventConsumer +# start EchoEventConsumer $C_status = $C->Spawn (); if ($C_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl index 48885aed884..bea754bbc5e 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl @@ -54,7 +54,7 @@ $IF = $ifr->CreateProcess ($IFRService, "-ORBdebuglevel $debug_level ". "-o $ifr_ifriorfile"); $TAO_IFR = "$ENV{ACE_ROOT}/bin/tao_ifr"; $TI = $ti->CreateProcess ($TAO_IFR, "-ORBInitRef InterfaceRepository=file://$ti_ifriorfile ". - "$idlfile"); + "$idlfile"); $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/CosEvent_Service"; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl index fb32874d788..c6af9642580 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl @@ -94,7 +94,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) { exit 1; } -# start EchoEventSupplier +# start EchoEventSupplier $S_status = $S->Spawn (); if ($S_status != 0) { @@ -102,7 +102,7 @@ if ($S_status != 0) { exit 1; } -# start EchoEventConsumer +# start EchoEventConsumer $C_status = $C->Spawn (); if ($C_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl index 8dd897e8579..f5fcb921b72 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl @@ -30,7 +30,7 @@ if ( -e "supplier.conf" ) { $supplier_conf_file = "supplier.conf"; } else{ - $supplier_conf_file = "../supplier.conf"; + $supplier_conf_file = "../supplier.conf"; } my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); @@ -107,7 +107,7 @@ if ($c2->PutFile ($nsiorfile) == -1) { exit 1; } -# start Supplier +# start Supplier $S1_status = $S1->Spawn (); if ($S1_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl index 62a7da11bbc..899c5b0cd8b 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl @@ -95,7 +95,7 @@ if ($es->WaitForFileTimed ($esiorfile,$es->ProcessStartWaitInterval()) == -1) { exit 1; } -# start EchoEventSupplier +# start EchoEventSupplier $S_status = $S->Spawn (); if ($S_status != 0) { @@ -103,7 +103,7 @@ if ($S_status != 0) { exit 1; } -# start EchoEventConsumer +# start EchoEventConsumer $C_status = $C->Spawn (); if ($C_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl index 8ddace59c15..14ca538cf83 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl @@ -63,7 +63,7 @@ if ( -e "supplier.conf" ) { $supplier_conf_file = "supplier.conf"; } else{ - $supplier_conf_file = "../supplier.conf"; + $supplier_conf_file = "../supplier.conf"; } my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); @@ -92,7 +92,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, "$flags ". " -o $ns_nsiorfile ". "-ORBListenEndpoints iiop://$ns_hostname:$ns_port"); - + my($port1) = $s1->RandomPort() ; my($port2) = $s1->RandomPort() ; my($mport) = $s1->RandomPort() ; @@ -102,7 +102,7 @@ if ($udp) { $args1 .= " -udp -ecname ec1 -port $port1 -listenport $port2 "; } else { $args1 .= " -ecname ec1 -address 224.9.9.2 -port $mport "; -} +} $S1 = $s1->CreateProcess ("EchoEventSupplier", "$args1"); diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl index 658cdce17c0..94a9ac73d13 100755 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Activator/run_test.pl @@ -1,4 +1,4 @@ -# $Id$ +# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' @@ -97,7 +97,7 @@ $TI->IgnoreExeSubDir(1); sub RunImRUtil { my $cmd = shift; - + print ">>> " . $TI->CommandLine() . "\n"; $TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile $cmd"); return $TI->SpawnWaitKill($ti->ProcessStartWaitInterval()); @@ -128,7 +128,7 @@ if ($ti->PutFile ($implrepo_ior) == -1) { } if (SpawnWait($Act, $activator_ior, $act) != 0) { - $ImR->Kill(); $ImR->TimedWait(1); + $ImR->Kill(); $ImR->TimedWait(1); exit 1; } @@ -136,19 +136,19 @@ if (SpawnWait($Act, $activator_ior, $act) != 0) { #we want to run the server once to generate the ior file. if (SpawnWait($Srv, $messenger_ior, $imr) != 0) { - $Act->Kill(); $Act->TimedWait(1); - $ImR->Kill(); $ImR->TimedWait(1); + $Act->Kill(); $Act->TimedWait(1); + $ImR->Kill(); $ImR->TimedWait(1); exit 1; } if ($imr->GetFile ($implrepo_ior) == -1) { print STDERR "ERROR: cannot retrieve file <$imr_srviorfile>\n"; - $Act->Kill(); $Act->TimedWait(1); + $Act->Kill(); $Act->TimedWait(1); $ImR->Kill (); $ImR->TimedWait (1); exit 1; } if ($c1->PutFile ($implrepo_ior) == -1) { print STDERR "ERROR: cannot set file <$c1_srviorfile>\n"; - $Act->Kill(); $Act->TimedWait(1); + $Act->Kill(); $Act->TimedWait(1); $ImR->Kill (); $ImR->TimedWait (1); exit 1; } @@ -165,7 +165,7 @@ if ($Srv_status != 0) { RunImRUtil("list -v"); -# Note : If the server registers itself, then it won't set the +# Note : If the server registers itself, then it won't set the # activator name. If we don't set it here, then the activator # won't be able to start the server. my $actname = $ti->hostname; diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp index 19ec658a911..e728c69788b 100644 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/Basic/MessengerServer.cpp @@ -87,10 +87,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { FILE *output_file= ACE_OS::fopen (ACE_TEXT_ALWAYS_CHAR(ior_output_file), "w"); if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - ior_output_file), - 1); + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s", + ior_output_file), + 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } diff --git a/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl b/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl index bed41037e93..dd8fa8ebc35 100755 --- a/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/ImplRepo/run_test.pl @@ -56,7 +56,7 @@ $c1->DeleteFile ($messenger_ior); $c2->DeleteFile ($messenger_ior); $si->DeleteFile ($messenger_ior); -# Note : We don't actually use SVR, but we need a way to get the +# Note : We don't actually use SVR, but we need a way to get the # path to the -ExeSubDir $SVR = $imr->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level"); my $server = $SVR->Executable (); @@ -154,7 +154,7 @@ $TI->IgnoreExeSubDir (1); ## Note : Instead of using tao_imr to generate the ior, it's easy enough ## to just create one by hand. The ior is just a normal corbaloc ior with -## the poa_name of the server and ip address of the imr. +## the poa_name of the server and ip address of the imr. ## (ie corbaloc::localhost:8888/Messengerservice) ## Of course, to do this, you'd have to start the imr on port 8888. ## We use the "tao_imr ior" command, because we don't know which port was used. diff --git a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl index bab252eda1e..d97b9bbad42 100755 --- a/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/InterfaceRepo/run_test.pl @@ -1,4 +1,4 @@ -# $Id$ +# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl index 4ede6d3629e..b4208f7bc0c 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl @@ -81,7 +81,7 @@ if ($CLI_status != 0) { $status = 1; } -# clean-up +# clean-up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl index 3e4fd9bf1d5..08d8f06f3f1 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl @@ -81,7 +81,7 @@ if ($CLI_status != 0) { $status = 1; } -# clean-up +# clean-up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp index d40e8496387..8215d5e4cef 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/Messenger_i.cpp @@ -13,12 +13,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, @@ -31,4 +31,4 @@ CORBA::Boolean Messenger_i::send_message ( std::cerr << "Message: " << message << std::endl; return 1; } - + diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl index 959dd590ba7..b1e85c1940a 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl @@ -85,7 +85,7 @@ if ($cli->PutFile ($srviorfile) == -1) { $SRV->Kill (); $SRV->TimedWait (1); exit 1; } - + # start MessengerClient $CLI_status = $CLI->SpawnWaitKill ($cli->ProcessStartWaitInterval()); @@ -94,7 +94,7 @@ if ($CLI_status != 0) { $status = 1; } -# clean-up +# clean-up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp index 21edede8773..f36aae87c0c 100644 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Server/Messenger_i.cpp @@ -14,12 +14,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, @@ -32,4 +32,4 @@ CORBA::Boolean Messenger_i::send_message ( std::cerr << "Message: " << message << std::endl; return 1; } - + diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl index 3df6d8ec73d..15b224f02b7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; - + use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; @@ -72,8 +72,8 @@ $nsdel = "$ENV{ACE_ROOT}/bin/tao_nsdel"; $test_number = 0; -foreach $o (@corbaloc_servers) { - # Run messenger server for each test. +foreach $o (@corbaloc_servers) { + # Run messenger server for each test. #print "Start $MessengerServer $o \n"; $SRV = $srv->CreateProcess ($MessengerServer, "-ORBdebuglevel $debug_level ". "$o"); @@ -127,7 +127,7 @@ if ($SRV_status != 0) { $i = 0; foreach $o (@corbaloc_clients) { - # Run the client for each test. + # Run the client for each test. #print "Start $MessengerClient $o \n"; $CLI = $cli->CreateProcess ($MessengerClient, "$o"); @@ -149,7 +149,7 @@ foreach $o (@corbaloc_clients) { } -# clean up +# clean up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl index 0f0aec8306e..592de952646 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl @@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; - + use lib "$ENV{ACE_ROOT}/bin"; use PerlACE::TestTarget; @@ -77,10 +77,10 @@ if ($srv->WaitForFileTimed ($msfile,$srv->ProcessStartWaitInterval()) == -1) { "Using default protocol (iiop) and default port ($def_port): \n", "Using Resolve Initial Reference form(must tell ORB where NS is located with -ORBInitRef)\n"); -# Run the client for each of the corbaname test. +# Run the client for each of the corbaname test. $test_number = 0; $MessengerClient = "MessengerClient"; -foreach $o (@corbaname_clients) { +foreach $o (@corbaname_clients) { $CLI = $cli->CreateProcess ($MessengerClient, "$o"); @@ -91,7 +91,7 @@ foreach $o (@corbaname_clients) { $NS->Kill(); $NS->TimedWait (1); exit 1; } - + $test_number++; print "======================================\n"; @@ -100,7 +100,7 @@ foreach $o (@corbaname_clients) { print "======================================\n\n"; } -# clean up +# clean up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp index 39b64f2faae..1d174c749d4 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerConsumer.cpp @@ -196,7 +196,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(output_file) ); iorFile << "Ready" << std::endl; iorFile.close(); - + orb->run(); } catch(const CORBA::Exception& ex) diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl index 98129a9a765..c31c38f6837 100755 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl @@ -69,7 +69,7 @@ if ($CLI_status != 0) { $status = 1; } -# clean-up +# clean-up $SRV_status = $SRV->TerminateWaitKill ($srv->ProcessStopWaitInterval()); if ($SRV_status != 0) { diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl index e4de857f914..95a2811a6ba 100755 --- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/run_test.pl @@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' if 0; -# $Id$ +# $Id$ # -*- perl -*- use lib "$ENV{ACE_ROOT}/bin"; diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp index a92cea8879f..c16cf35e730 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/Messenger_i.cpp @@ -6,12 +6,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl index bb6201a9af4..bfd91c045b6 100755 --- a/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/Security/PolicyControllingApp/run_test.pl @@ -1,4 +1,4 @@ -# $Id$ +# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp index 809cfcc584f..5c368d02392 100644 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/Messenger_i.cpp @@ -13,12 +13,12 @@ Messenger_i::Messenger_i (void) { } - + // Implementation skeleton destructor Messenger_i::~Messenger_i (void) { } - + CORBA::Boolean Messenger_i::send_message ( const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl index 1ccc9ab5cbf..b285e341383 100755 --- a/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/run_test.pl @@ -1,4 +1,4 @@ -# $Id$ +# $Id$ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp index c80e78b1ec9..509a8d9c208 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp @@ -183,7 +183,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { notify_ior += ":"; notify_ior += ACE_TEXT_ALWAYS_CHAR (port); notify_ior += "/NotifyEventChannelFactory"; - + obj = orb->string_to_object(notify_ior.c_str()); CosNotifyChannelAdmin::EventChannelFactory_var ecf = CosNotifyChannelAdmin::EventChannelFactory::_unchecked_narrow(obj.in()); diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt index 9b671360a80..8d158eb573a 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt @@ -1,4 +1,4 @@ // $Id$ This test uses valuetypes within simple CosEC::Any events passed through the -notification service. +notification service. diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp index 06759c263d5..f4996d63f1e 100644 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp @@ -207,7 +207,7 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()); PortableServer::POAManager_var mgr = poa->the_POAManager(); - + // "corbaloc::localhost:8888/NotifyEventChannelFactory" ACE_CString notify_ior ("corbaloc::"); notify_ior += ACE_TEXT_ALWAYS_CHAR (hostname); diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 8e980c90a93..2567e4af055 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -1113,11 +1113,11 @@ ifr_adding_visitor::visit_provides (AST_Provides *node) ::CORBA::ComponentIR::ComponentDef_var c = ::CORBA::ComponentIR::ComponentDef::_narrow ( this->ir_current_.in ()); - + ACE_CString comp_str (c->_interface_repository_id ()); char *local_name = node->local_name ()->get_string (); this->expand_id (comp_str, local_name); - + ::CORBA::ComponentIR::ProvidesDef_var new_def = c->create_provides (comp_str.fast_rep (), local_name, @@ -1136,7 +1136,7 @@ ifr_adding_visitor::visit_uses (AST_Uses *node) ::CORBA::InterfaceDef_var interface_type = ::CORBA::InterfaceDef::_narrow (contained.in ()); - + ::CORBA::ComponentIR::ComponentDef_var c = ::CORBA::ComponentIR::ComponentDef::_narrow ( this->ir_current_.in ()); @@ -1144,7 +1144,7 @@ ifr_adding_visitor::visit_uses (AST_Uses *node) ACE_CString comp_str (c->_interface_repository_id ()); char *local_name = node->local_name ()->get_string (); this->expand_id (comp_str, local_name); - + ::CORBA::ComponentIR::UsesDef_var new_def = c->create_uses (comp_str.fast_rep (), local_name, @@ -1164,7 +1164,7 @@ ifr_adding_visitor::visit_publishes (AST_Publishes *node) ::CORBA::ComponentIR::EventDef_var event_type = ::CORBA::ComponentIR::EventDef::_narrow (contained.in ()); - + ::CORBA::ComponentIR::ComponentDef_var c = ::CORBA::ComponentIR::ComponentDef::_narrow ( this->ir_current_.in ()); @@ -1172,7 +1172,7 @@ ifr_adding_visitor::visit_publishes (AST_Publishes *node) ACE_CString comp_str (c->_interface_repository_id ()); char *local_name = node->local_name ()->get_string (); this->expand_id (comp_str, local_name); - + ::CORBA::ComponentIR::PublishesDef_var new_def = c->create_publishes (comp_str.fast_rep (), local_name, @@ -1191,7 +1191,7 @@ ifr_adding_visitor::visit_emits (AST_Emits *node) ::CORBA::ComponentIR::EventDef_var event_type = ::CORBA::ComponentIR::EventDef::_narrow (contained.in ()); - + ::CORBA::ComponentIR::ComponentDef_var c = ::CORBA::ComponentIR::ComponentDef::_narrow ( this->ir_current_.in ()); @@ -1199,7 +1199,7 @@ ifr_adding_visitor::visit_emits (AST_Emits *node) ACE_CString comp_str (c->_interface_repository_id ()); char *local_name = node->local_name ()->get_string (); this->expand_id (comp_str, local_name); - + ::CORBA::ComponentIR::EmitsDef_var new_def = c->create_emits (comp_str.fast_rep (), local_name, @@ -1218,7 +1218,7 @@ ifr_adding_visitor::visit_consumes (AST_Consumes *node) ::CORBA::ComponentIR::EventDef_var event_type = ::CORBA::ComponentIR::EventDef::_narrow (contained.in ()); - + ::CORBA::ComponentIR::ComponentDef_var c = ::CORBA::ComponentIR::ComponentDef::_narrow ( this->ir_current_.in ()); @@ -1226,7 +1226,7 @@ ifr_adding_visitor::visit_consumes (AST_Consumes *node) ACE_CString comp_str (c->_interface_repository_id ()); char *local_name = node->local_name ()->get_string (); this->expand_id (comp_str, local_name); - + ::CORBA::ComponentIR::ConsumesDef_var new_def = c->create_consumes (comp_str.fast_rep (), local_name, @@ -1914,7 +1914,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) try { AST_Type *type = node->field_type (); - + // Save to be replaced later. holder = ::CORBA::IDLType::_duplicate (this->ir_current_.in ()); @@ -1993,7 +1993,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node) return -1; } - + // Restore entry of component or interface. this->ir_current_ = ::CORBA::IDLType::_duplicate (holder.in ()); @@ -2746,7 +2746,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) { AST_Interface *intf = AST_Interface::narrow_from_decl (parents[i]); - + if (intf == 0) { ACE_ERROR_RETURN (( @@ -2757,7 +2757,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) parents[i]->full_name ()), -1); } - + result = be_global->repository ()->lookup_id (intf->repoID ()); @@ -2808,7 +2808,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) { AST_Interface *intf = AST_Interface::narrow_from_decl (parents[i]); - + if (intf == 0) { ACE_ERROR_RETURN (( @@ -2819,7 +2819,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node) parents[i]->full_name ()), -1); } - + result = be_global->repository ()->lookup_id (intf->repoID ()); @@ -3990,14 +3990,14 @@ ifr_adding_visitor::visit_all_factories (AST_Home *node, { AST_Decl *d = h_iter.item (); AST_Decl::NodeType nt = d->node_type (); - + if (nt != AST_Decl::NT_factory) { continue; } - + AST_Factory *f = AST_Factory::narrow_from_decl (d); - + CORBA::ParDescriptionSeq params; this->fill_params (params, f); @@ -4026,7 +4026,7 @@ ifr_adding_visitor::visit_all_finders (AST_Home *node, h_iter.next ()) { f = AST_Finder::narrow_from_decl (h_iter.item ()); - + if (f == 0) { continue; diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp index 523ee0e5ea9..c349825d1d7 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp @@ -216,121 +216,121 @@ ifr_visitor::visit_structure (AST_Structure *) return 0; } -int +int ifr_visitor::visit_structure_fwd (AST_StructureFwd *) { return 0; } -int +int ifr_visitor::visit_exception (AST_Exception *) { return 0; } -int +int ifr_visitor::visit_expression (AST_Expression *) { return 0; } -int +int ifr_visitor::visit_enum (AST_Enum *) { return 0; } -int +int ifr_visitor::visit_operation (AST_Operation *) { return 0; } -int +int ifr_visitor::visit_field (AST_Field *) { return 0; } -int +int ifr_visitor::visit_argument (AST_Argument *) { return 0; } -int +int ifr_visitor::visit_attribute (AST_Attribute *) { return 0; } -int +int ifr_visitor::visit_union (AST_Union *) { return 0; } -int +int ifr_visitor::visit_union_fwd (AST_UnionFwd *) { return 0; } -int +int ifr_visitor::visit_union_branch (AST_UnionBranch *) { return 0; } -int +int ifr_visitor::visit_union_label (AST_UnionLabel *) { return 0; } -int +int ifr_visitor::visit_constant (AST_Constant *) { return 0; } -int +int ifr_visitor::visit_enum_val (AST_EnumVal *) { return 0; } -int +int ifr_visitor::visit_array (AST_Array *) { return 0; } -int +int ifr_visitor::visit_sequence (AST_Sequence *) { return 0; } -int +int ifr_visitor::visit_string (AST_String *) { return 0; } -int +int ifr_visitor::visit_typedef (AST_Typedef *) { return 0; } -int +int ifr_visitor::visit_root (AST_Root *) { return 0; } -int +int ifr_visitor::visit_native (AST_Native *) { return 0; diff --git a/TAO/orbsvcs/ImplRepo_Service/README.txt b/TAO/orbsvcs/ImplRepo_Service/README.txt index f6f8082f21b..9579012f2d7 100644 --- a/TAO/orbsvcs/ImplRepo_Service/README.txt +++ b/TAO/orbsvcs/ImplRepo_Service/README.txt @@ -186,9 +186,9 @@ Commandline Arguments that can be passed to ImplRepo_Service -o generate the ior. -x support persistence to the ImplRepo_Service. We use XML to support persistence. Names of the activators registered with the locator, - their IORs, and the servers registered with each of the activators are - saved to the xml file. Use this option to pass the name of the file - where the data has to be saved. + their IORs, and the servers registered with each of the activators are + saved to the xml file. Use this option to pass the name of the file + where the data has to be saved. And, ofcourse, the ORB Options. @@ -510,18 +510,18 @@ The Implementation Repository supports start and stop but not pause. When the Activator is installed using ImR_Activator -c install, it is added with a dependency on a locator service. If you don't wish to also install the locator on the same machine, then you must use the -c install_no_imr -option instead. +option instead. @subsection serviceopts Service Options Any options that are specified along with -c install, will be saved in -the registry under +the registry under HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRActivator\Parameters and -HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRLocator\Parameters. +HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TAOIMRLocator\Parameters. For example: ImR_Activator -c install -d 3 -l -m -o activator.ior -x persist.xml -t 30 -orbendpoint iiop://:9988 -orbdebuglevel 1 -The order of arguments makes no difference, but you must run +The order of arguments makes no difference, but you must run -c remove and then -c install if you want to change the parameters. You can also manually change these using the typical regedit utility. diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index e1832358b73..7937126a7d2 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -11,7 +11,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" #include "ace/OS_NS_strings.h" -#include "ace/os_include/os_netdb.h" +#include "ace/os_include/os_netdb.h" #include "ace/OS_NS_unistd.h" TAO_IMR_i::TAO_IMR_i (void) diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl index 00424bfa608..e4895d84c90 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl @@ -7,7 +7,7 @@ #include "orbsvcs/CosTypedEventComm.idl" -interface Country : ::CosTypedEventComm::TypedPushConsumer +interface Country : ::CosTypedEventComm::TypedPushConsumer { void update_population (in string country, in long population); diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl index 3fe92494b75..021d13e345b 100755 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl @@ -52,9 +52,9 @@ $ces->DeleteFile ($cesiorfile); $con->DeleteFile ($coniorfile); -$IFR = $ifr->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/IFR_Service/IFR_Service", +$IFR = $ifr->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/IFR_Service/IFR_Service", " -o $ifr_ifriorfile"); -$TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr", +$TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr", " -ORBInitRef InterfaceRepository=file://$ti_ifriorfile ". "-I".$ENV{"TAO_ROOT"}."/orbsvcs $ti_idl"); $NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", @@ -64,7 +64,7 @@ $CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/CosEvent_Service/CosEvent "-ORBInitRef InterfaceRepository=file://$ces_ifriorfile ". "-ORBInitRef NameService=file://$ces_nsiorfile "); $CON = $con->CreateProcess ("Consumer", - "-o $con_coniorfile ". + "-o $con_coniorfile ". "-ORBInitRef NameService=file://$con_nsiorfile "); $SUP = $sup->CreateProcess ("Supplier", "-ORBInitRef NameService=file://$sup_nsiorfile "); diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl b/TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl index a9285c15e19..52eca0765a0 100755 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/run_test.pl @@ -92,8 +92,8 @@ sub cleanup if (m/ImR Activator: Successfully started/) { chomp $_; my @words = split (/=/, $_); - push(@pids, $words[1]); - ++ $i; + push(@pids, $words[1]); + ++ $i; } } close (TEST_OUTPUT); @@ -183,7 +183,7 @@ sub do_test print "ERROR : Shutting down test server.\n"; return $ret; } - + # Both TestObject1 and TestObject2 should now show up as "not running" $IMRUTIL->Arguments ("-ORBLogFile $output_files[$id_imru_log] $imr_initref list -v"); $ret = $IMRUTIL->SpawnWaitKill ($test->ProcessStartWaitInterval()); diff --git a/TAO/orbsvcs/examples/LoadBalancing/Test.idl b/TAO/orbsvcs/examples/LoadBalancing/Test.idl index c9f270a36a3..ea0cb943d44 100644 --- a/TAO/orbsvcs/examples/LoadBalancing/Test.idl +++ b/TAO/orbsvcs/examples/LoadBalancing/Test.idl @@ -22,7 +22,7 @@ module Test raises (Invalid_Stock_Symbol); oneway void shutdown (); - + }; interface Stock diff --git a/TAO/orbsvcs/examples/LoadBalancing/run_test.pl b/TAO/orbsvcs/examples/LoadBalancing/run_test.pl index ae728b8f090..8ad2ff3a670 100755 --- a/TAO/orbsvcs/examples/LoadBalancing/run_test.pl +++ b/TAO/orbsvcs/examples/LoadBalancing/run_test.pl @@ -53,29 +53,29 @@ $cl->DeleteFile ($srviorfile); $sr->DeleteFile ($srviorfile); $cr->DeleteFile ($srviorfile); -$LM = $lm->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/LoadManager", +$LM = $lm->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/LoadManager", " -o $lm_lmiorfile"); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("server", +$SV = $sv->CreateProcess ("server", "-o $sv_srviorfile ". " -ORBInitRef LoadManager=file://$sv_lmiorfile ". " -n 1 ". "-ORBInitRef NameService=file://$sv_nsiorfile ". " -s LeastLoaded ". " -r 9000 -c 10300 -d 0.1 "); -$SR = $sr->CreateProcess ("server", +$SR = $sr->CreateProcess ("server", "-o $sr_srviorfile ". "-ORBInitRef LoadManager=file://$sr_lmiorfile ". " -n 2 ". "-ORBInitRef NameService=file://sr_nsiorfile ". " -s LeastLoaded ". "-r 9000 -c 10300 -d 0.1 "); -$CL = $cl->CreateProcess ("client", +$CL = $cl->CreateProcess ("client", "-k file://$cl_srviorfile ". " -i 5 -n 1 ". "-ORBInitRef NameService=file://cl_nsiorfile "); -$CR = $cr->CreateProcess ("client", +$CR = $cr->CreateProcess ("client", "-k file://$cr_srviorfile ". "-i 5 -n 2 ". "-ORBInitRef NameService=file://cr_nsiorfile "); diff --git a/TAO/orbsvcs/examples/Log/Basic/run_test.pl b/TAO/orbsvcs/examples/Log/Basic/run_test.pl index 7b49ee1b3d6..aec7369794e 100755 --- a/TAO/orbsvcs/examples/Log/Basic/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Basic/run_test.pl @@ -1,7 +1,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' - if 0; - + if 0; + # $Id$ # -*- perl -*- @@ -31,11 +31,11 @@ $ls->DeleteFile ($nsiorfile); $cli->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service", +$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service", " -ORBInitRef NameService=file://$ls_nsiorfile"); -$CLI = $cli->CreateProcess ("client", +$CLI = $cli->CreateProcess ("client", "-ORBInitRef NameService=file://$cli_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -80,7 +80,7 @@ if ($LS_status != 0) { exit 1; } -# Give time for logging service to initialize and install its object +# Give time for logging service to initialize and install its object # reference in the nameing service. sleep (5); diff --git a/TAO/orbsvcs/examples/Log/Event/run_test.pl b/TAO/orbsvcs/examples/Log/Event/run_test.pl index ccc55677401..ac163fe6edd 100755 --- a/TAO/orbsvcs/examples/Log/Event/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Event/run_test.pl @@ -1,7 +1,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' - if 0; - + if 0; + # $Id$ # -*- perl -*- @@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service", +$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service", " -ORBInitRef NameService=file://$ls_nsiorfile"); -$CON = $con->CreateProcess ("Event_Consumer", +$CON = $con->CreateProcess ("Event_Consumer", "-ORBInitRef NameService=file://$con_nsiorfile"); -$SUP = $sup->CreateProcess ("Event_Supplier", +$SUP = $sup->CreateProcess ("Event_Supplier", "-ORBInitRef NameService=file://$sup_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -88,7 +88,7 @@ if ($LS_status != 0) { exit 1; } -# Give time for logging service to initialize and install its object +# Give time for logging service to initialize and install its object # reference in the naming service. sleep (5); diff --git a/TAO/orbsvcs/examples/Log/Notify/run_test.pl b/TAO/orbsvcs/examples/Log/Notify/run_test.pl index 693467fbb40..5141e25fdc1 100755 --- a/TAO/orbsvcs/examples/Log/Notify/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Notify/run_test.pl @@ -1,7 +1,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' - if 0; - + if 0; + # $Id$ # -*- perl -*- @@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service", +$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service", " -ORBInitRef NameService=file://$ls_nsiorfile"); -$CON = $con->CreateProcess ("Notify_Consumer", +$CON = $con->CreateProcess ("Notify_Consumer", "-ORBInitRef NameService=file://$con_nsiorfile"); -$SUP = $sup->CreateProcess ("Notify_Supplier", +$SUP = $sup->CreateProcess ("Notify_Supplier", "-ORBInitRef NameService=file://$sup_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -88,7 +88,7 @@ if ($LS_status != 0) { exit 1; } -# Give time for logging service to initialize and install its object +# Give time for logging service to initialize and install its object # reference in the naming service. sleep (5); diff --git a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl index 10e1252164c..2ae7d1b6b06 100755 --- a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl +++ b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl @@ -1,7 +1,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' & eval 'exec perl -S $0 $argv:q' - if 0; - + if 0; + # $Id$ # -*- perl -*- @@ -33,13 +33,13 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service", +$LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service", " -ORBInitRef NameService=file://$ls_nsiorfile"); -$CON = $con->CreateProcess ("RTEvent_Consumer", +$CON = $con->CreateProcess ("RTEvent_Consumer", "-ORBInitRef NameService=file://$con_nsiorfile"); -$SUP = $sup->CreateProcess ("RTEvent_Supplier", +$SUP = $sup->CreateProcess ("RTEvent_Supplier", "-ORBInitRef NameService=file://$sup_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -88,7 +88,7 @@ if ($LS_status != 0) { exit 1; } -# Give time for logging service to initialize and install its object +# Give time for logging service to initialize and install its object # reference in the naming service. sleep (5); diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index 36f7c0ae45d..65c729bd492 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -35,14 +35,14 @@ $nfs->DeleteFile ($nsiorfile); $flt->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", " -o $ns_nsiorfile"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; -$FLT = $flt->CreateProcess ("Filter", +$FLT = $flt->CreateProcess ("Filter", " -o $ns_nsiorfile"); $Filter_Args = "-ORBInitRef NameService=file://$flt_nsiorfile -ORBDebugLevel $debug_level"; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index e87cc47f979..ce75dd5530a 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -57,7 +57,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 28f694b5206..9dc4a12037d 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -38,13 +38,13 @@ $nfs->DeleteFile ($nsiorfile); $sub->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; -$SUB = $sub->CreateProcess ("Subscribe"); +$SUB = $sub->CreateProcess ("Subscribe"); $Subscribe_Args = "-ORBInitRef NameService=file://$sub_nsiorfile -ORBDebugLevel $debug_level"; $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index 61f862dab37..0d6d069a962 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -63,7 +63,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl b/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl index a34cba2cb9e..c5c8b9ffa01 100755 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl @@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$T1 = $t1->CreateProcess ("EC", +$T1 = $t1->CreateProcess ("EC", " -ORBInitRef NameService=file://$t1_nsiorfile ". "-ORBsvcconf $t1_conffile ". "-e channel1"); -$T2 = $t2->CreateProcess ("EC", +$T2 = $t2->CreateProcess ("EC", " -ORBInitRef NameService=file://$t2_nsiorfile ". "-ORBsvcconf $t2_conffile ". "-e channel2"); -$G = $g->CreateProcess ("Gateway", +$G = $g->CreateProcess ("Gateway", " -ORBInitRef NameService=file://$g_nsiorfile ". "-ORBSvcconf $g_gconffile ". "-c channel2 ". "-s channel1"); -$C = $c->CreateProcess ("Consumer", +$C = $c->CreateProcess ("Consumer", " -ORBInitRef NameService=file://$c_nsiorfile ". "-ORBDebugLevel $debug_level ". "-e channel2"); -$S = $s->CreateProcess ("Supplier", +$S = $s->CreateProcess ("Supplier", " -ORBInitRef NameService=file://$s_nsiorfile ". "-e channel1"); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl b/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl index 4a6868692c2..c49eabe8d0c 100755 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl @@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$T1 = $t1->CreateProcess ("EC", +$T1 = $t1->CreateProcess ("EC", " -ORBInitRef NameService=file://$t1_nsiorfile ". "-ORBsvcconf $t1_conffile ". "-e channel1"); -$T2 = $t2->CreateProcess ("EC", +$T2 = $t2->CreateProcess ("EC", " -ORBInitRef NameService=file://$t2_nsiorfile ". "-ORBsvcconf $t2_conffile ". "-e channel2"); -$G = $g->CreateProcess ("Gateway", +$G = $g->CreateProcess ("Gateway", " -ORBInitRef NameService=file://$g_nsiorfile ". "-ORBSvcconf $g_gconffile ". "-c channel2 ". "-s channel1"); -$C = $c->CreateProcess ("Consumer", +$C = $c->CreateProcess ("Consumer", " -ORBInitRef NameService=file://$c_nsiorfile ". "-ORBDebugLevel $debug_level ". "-e channel2"); -$S = $s->CreateProcess ("Supplier", +$S = $s->CreateProcess ("Supplier", " -ORBInitRef NameService=file://$s_nsiorfile ". "-e channel1"); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl index 9ae1b828b0f..1d3d82363c8 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl @@ -26,7 +26,7 @@ TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address) ACE_INLINE ACE_QoS_Session* TAO_AV_UDP_QoS_Flow_Handler::qos_session (void) -{ +{ return this->qos_session_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index cab1194fd19..240f08690ad 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -662,7 +662,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/) SO_RCVBUF, (void *) &buf_size, &s) == -1) buf_size = BUFSIZ; - + ((TAO_AV_TCP_Object*)(this->protocol_object_))->frame_.size (buf_size); // Called by the <Strategy_Acceptor> when the handler is completely diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl index 1e40c191651..238ded3e076 100644 --- a/TAO/orbsvcs/orbsvcs/AVStreams.idl +++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl @@ -5,7 +5,7 @@ * * $Id$ * - * @author Sumedh Mungee <sumedh@cs.wustl.edu> + * @author Sumedh Mungee <sumedh@cs.wustl.edu> * @author Nagarajan Surendran <naga@cs.wustl.edu> */ //============================================================================= @@ -18,14 +18,14 @@ #pragma prefix "omg.org" -/** +/** * @brief IDL for Control and Management of Audio/Video Streams * Revised Submission. - */ + */ module AVStreams { - /** + /** * @struct QoS * @brief This structure represents QoS for a given type. * E.g. {"video_qos", <"video_framerate", 26>, @@ -40,7 +40,7 @@ module AVStreams /// Sequence of name value pairs, see e.g. above. }; - /// The QoS of a stream is a sequence of QoS structs (defined above) + /// The QoS of a stream is a sequence of QoS structs (defined above) typedef sequence<QoS> streamQoS; /// flowSpec is used to keep transport protocol information Each @@ -72,7 +72,7 @@ module AVStreams * @enum flowState * @brief Represents the state of a flow */ - enum flowState + enum flowState { stopped, started, @@ -83,13 +83,13 @@ module AVStreams * @enum dirType * @brief The direction of a flow. */ - enum dirType + enum dirType { dir_in, dir_out }; - /** + /** * @struct flowStatus * @brief Used to store the status of a flow. */ @@ -106,24 +106,24 @@ module AVStreams /// Used to convey events, in Basic_StreamCtrl::push_event. typedef CosPropertyService::Property streamEvent; - - exception notSupported + + exception notSupported { /// Used to indicate that an operation is not supported. }; - exception PropertyException + exception PropertyException { /// Property exception: raised by VDev::configure (). }; - exception FPError - { + exception FPError + { /// An flow protocol related error. - string flow_name; + string flow_name; }; - + exception streamOpFailed { /// Raised by operations on streams. @@ -136,7 +136,7 @@ module AVStreams string reason; }; - exception noSuchFlow + exception noSuchFlow { /// Used to indicate that an invalid flow name was used for the /// operation. @@ -163,41 +163,41 @@ module AVStreams /// Start the transfer of data in the stream. Empty the_spec /// means apply operation to all flows. void start (in flowSpec the_spec) raises (noSuchFlow); - + /// Tears down the stream. This will close the connection, and /// delete the streamendpoint and vdev associated with this /// stream Empty the_spec means apply operation to all flows. void destroy (in flowSpec the_spec) raises (noSuchFlow); - + /// Changes the QoS associated with the stream Empty the_spec /// means apply operation to all flows. boolean modify_QoS (inout streamQoS new_qos, in flowSpec the_spec) - raises (noSuchFlow, + raises (noSuchFlow, QoSRequestFailed); /// Called by StreamEndPoint when something goes wrong with a /// flow. oneway void push_event (in streamEvent the_event); - + /// Used to control the flow protocol parameters. void set_FPStatus (in flowSpec the_spec, - in string fp_name, - in any fp_settings) - raises (noSuchFlow, + in string fp_name, + in any fp_settings) + raises (noSuchFlow, FPError); - + /// Not implemented in the light profile, will raise the /// notsupported exception. - Object get_flow_connection (in string flow_name) - raises (noSuchFlow, + Object get_flow_connection (in string flow_name) + raises (noSuchFlow, notSupported); - + /// Not implemented in the light profile, will raise the /// notsupported exception. void set_flow_connection (in string flow_name, in Object flow_connection) - raises (noSuchFlow, + raises (noSuchFlow, notSupported); }; @@ -226,33 +226,33 @@ module AVStreams * is used to control the stream. It should be subclassed * by applications that want to provide more control features. */ - interface StreamCtrl : Basic_StreamCtrl + interface StreamCtrl : Basic_StreamCtrl { - + boolean bind_devs (in MMDevice a_party, in MMDevice b_party, inout streamQoS the_qos, in flowSpec the_flows) - raises (streamOpFailed, - noSuchFlow, + raises (streamOpFailed, + noSuchFlow, QoSRequestFailed); /// Establish a stream between a_party and b_party, with qos /// the_qos, and for the flows in the_flows if the_flows is /// empty, bind all the flows Causes a connection to be /// established between the StreamEndpoints. Returns /// success/failure - + boolean bind (in StreamEndPoint_A a_party, in StreamEndPoint_B b_party, inout streamQoS the_qos, in flowSpec the_flows) - raises (streamOpFailed, - noSuchFlow, + raises (streamOpFailed, + noSuchFlow, QoSRequestFailed); /// Establish a connection between two streamendpoints. This can /// be used if the streamendpoints have been created independent /// of a MMDevice - - void unbind_dev(in MMDevice dev, in flowSpec the_spec) + + void unbind_dev(in MMDevice dev, in flowSpec the_spec) raises (streamOpFailed, noSuchFlow); /// Unbind the_ep from the stream. Empty the_spec means apply to @@ -265,8 +265,8 @@ module AVStreams void unbind () raises (streamOpFailed); - VDev get_related_vdev(in MMDevice adev, - out StreamEndPoint sep) + VDev get_related_vdev(in MMDevice adev, + out StreamEndPoint sep) raises (streamOpFailed); }; @@ -276,27 +276,27 @@ module AVStreams * @brief Interface for multicasting operations. */ interface MCastConfigIf : CosPropertyService::PropertySet{ - /// Set a peer in the multicast tree. + /// Set a peer in the multicast tree. boolean set_peer (in Object peer, inout streamQoS the_qos, in flowSpec the_spec) - raises (QoSRequestFailed, + raises (QoSRequestFailed, streamOpFailed); - /// Configure the multicast stream. + /// Configure the multicast stream. void configure (in CosPropertyService::Property a_configuration); - /// Sets the initial configuration to be used for all added peers. + /// Sets the initial configuration to be used for all added peers. void set_initial_configuration (in CosPropertyService::Properties initial); - + /// Uses <format_name> standardised by OMG and IETF /// Multicasting operations are not supported yet. - void set_format (in string flowName, + void set_format (in string flowName, in string format_name) raises (notSupported); - + /// Note, some of these device params are standardised by OMG /// Multicasting operations are not supported yet. void set_dev_params (in string flowName, @@ -316,25 +316,25 @@ module AVStreams interface StreamEndPoint : CosPropertyService::PropertySet{ /// Stop the stream. Empty the_spec means, for all the flows. - void stop (in flowSpec the_spec) + void stop (in flowSpec the_spec) raises (noSuchFlow); - /// Start the stream, Empty the_spec means, for all the flows. - void start (in flowSpec the_spec) + /// Start the stream, Empty the_spec means, for all the flows. + void start (in flowSpec the_spec) raises (noSuchFlow); - /// Destroy the stream, Empty the_spec means, for all the flows. - void destroy (in flowSpec the_spec) + /// Destroy the stream, Empty the_spec means, for all the flows. + void destroy (in flowSpec the_spec) raises (noSuchFlow); - + /// Called by StreamCtrl. responder is the peer to connect with. boolean connect (in StreamEndPoint responder, inout streamQoS qos_spec, in flowSpec the_spec) - raises (noSuchFlow, - QoSRequestFailed, + raises (noSuchFlow, + QoSRequestFailed, streamOpFailed); - + /// Called by the peer StreamEndPoint. The flow_spec indicates /// the flows (which contain transport addresses etc.). boolean request_connection (in StreamEndPoint initiator, @@ -343,51 +343,51 @@ module AVStreams inout flowSpec the_spec) raises (streamOpDenied, noSuchFlow, QoSRequestFailed, FPError); - + /// Change the transport qos on a stream. boolean modify_QoS (inout streamQoS new_qos, in flowSpec the_flows) - raises (noSuchFlow, + raises (noSuchFlow, QoSRequestFailed); - + /// Used to restrict the set of protocols. boolean set_protocol_restriction (in protocolSpec the_pspec); - + /// Disconnect the flows. void disconnect(in flowSpec the_spec) - raises (noSuchFlow, + raises (noSuchFlow, streamOpFailed); - + /// Used to control the SFP parameters. void set_FPStatus (in flowSpec the_spec, in string fp_name, in any fp_settings) - raises (noSuchFlow, + raises (noSuchFlow, FPError); /// Not implemented in the light profile, throws notsupported. Object get_fep (in string flow_name) - raises (notSupported, + raises (notSupported, noSuchFlow); - + /// Not implemented in the light profile, throws notsupported. string add_fep (in Object the_fep) /// Can fail for reasons {duplicateFepName, duplicateRef} - raises (notSupported, + raises (notSupported, streamOpFailed); - + /// Not implemented in the light profile, throws notsupported. void remove_fep (in string fep_name) - raises (notSupported, + raises (notSupported, streamOpFailed); - + /// Used to "attach" a negotiator to the endpoint. void set_negotiator (in Negotiator new_negotiator); /// Used for public key encryption. - void set_key (in string flow_name, + void set_key (in string flow_name, in key the_key); - + /// Used to set a unique id for packets sent by this /// streamendpoint. void set_source_id (in long source_id); @@ -421,7 +421,7 @@ module AVStreams * @interface StreamEndPoint_B * @brief The "B" side of a streamendpoint. */ - interface StreamEndPoint_B : StreamEndPoint + interface StreamEndPoint_B : StreamEndPoint { /// Used for ATM-style multicast. boolean multiconnect (inout streamQoS the_qos, @@ -443,8 +443,8 @@ module AVStreams in VDev the_peer_dev, inout streamQoS the_qos, in flowSpec the_spec) - raises (noSuchFlow, - QoSRequestFailed, + raises (noSuchFlow, + QoSRequestFailed, streamOpFailed); /// Used to set the streamctrl and multicast device. @@ -452,18 +452,18 @@ module AVStreams in MCastConfigIf a_mcastconfigif, inout streamQoS the_qos, in flowSpec the_spec) - raises (noSuchFlow, - QoSRequestFailed, + raises (noSuchFlow, + QoSRequestFailed, streamOpFailed); /// Called by the peer VDev to configure the device (catch all). void configure (in CosPropertyService::Property the_config_mesg) - raises (PropertyException, + raises (PropertyException, streamOpFailed); /// Uses <formatName> standardised by OMG and IETF /// Used to set a format on a flowname. - void set_format (in string flowName, + void set_format (in string flowName, in string format_name) raises (notSupported); @@ -471,23 +471,23 @@ module AVStreams /// Used to set device parameters. void set_dev_params (in string flowName, in CosPropertyService::Properties new_params) - raises (PropertyException, + raises (PropertyException, streamOpFailed); /// Called to change QoS of the device. boolean modify_QoS (inout streamQoS the_qos, in flowSpec the_spec) - raises (noSuchFlow, + raises (noSuchFlow, QoSRequestFailed); }; - /** + /** * @interface MMDevice * @brief Implements a factory to create Endpoints and VDevs. */ - interface MMDevice : CosPropertyService::PropertySet + interface MMDevice : CosPropertyService::PropertySet { /// Called by StreamCtrl to create a "A" type streamendpoint and /// vdev. @@ -497,10 +497,10 @@ module AVStreams out boolean met_qos, inout string named_vdev, in flowSpec the_spec) - raises (streamOpFailed, - streamOpDenied, + raises (streamOpFailed, + streamOpDenied, notSupported, - QoSRequestFailed, + QoSRequestFailed, noSuchFlow); /// Called by StreamCtrl to create a "B" type streamendpoint and @@ -511,50 +511,50 @@ module AVStreams out boolean met_qos, inout string named_vdev, in flowSpec the_spec) - raises (streamOpFailed, - streamOpDenied, + raises (streamOpFailed, + streamOpDenied, notSupported, - QoSRequestFailed, + QoSRequestFailed, noSuchFlow); - + /// Can be used to request the MMDevice to create a new /// StreamCtrl, and call bind_devs on it. StreamCtrl bind (in MMDevice peer_device, inout streamQoS the_qos, out boolean is_met, in flowSpec the_spec) - raises (streamOpFailed, - noSuchFlow, + raises (streamOpFailed, + noSuchFlow, QoSRequestFailed); - + /// Multicast bind. StreamCtrl bind_mcast (in MMDevice first_peer, inout streamQoS the_qos, out boolean is_met, in flowSpec the_spec) - raises (streamOpFailed, - noSuchFlow, + raises (streamOpFailed, + noSuchFlow, QoSRequestFailed); /// Remove the StreamEndPoint and the related vdev. - void destroy (in StreamEndPoint the_ep, + void destroy (in StreamEndPoint the_ep, in string vdev_name) // ie VDev not found raises (notSupported); - + /// Not supported in the light profile, raises notsupported. string add_fdev (in Object the_fdev) - raises (notSupported, + raises (notSupported, streamOpFailed); /// Not supported in the light profile, raises notsupported. Object get_fdev (in string flow_name) - raises (notSupported, + raises (notSupported, noSuchFlow); /// Not supported in the light profile, raises notsupported. void remove_fdev (in string flow_name) - raises (notSupported, + raises (notSupported, noSuchFlow, streamOpFailed); }; @@ -593,8 +593,8 @@ module AVStreams boolean connect_devs(in FDev a_party, in FDev b_party, inout AVStreams::QoS the_qos) - raises (AVStreams::streamOpFailed, - AVStreams::streamOpDenied, + raises (AVStreams::streamOpFailed, + AVStreams::streamOpDenied, AVStreams::QoSRequestFailed); boolean connect(in FlowProducer flow_producer, @@ -639,7 +639,7 @@ module AVStreams in any fp_settings) raises (AVStreams::FPError, AVStreams::notSupported); - /// set_format() initializes ëformatí + /// set_format() initializes ëformatí /// as current media format e.g. MPEG. void set_format(in string format) raises (AVStreams::notSupported); @@ -647,11 +647,11 @@ module AVStreams void set_dev_params(in CosPropertyService::Properties new_settings) // raises (CosPropertyService::PropertyException, AVStreams::streamOpFailed); raises (PropertyException, AVStreams::streamOpFailed); - + void set_protocol_restriction(in AVStreams::protocolSpec the_spec) raises (AVStreams::notSupported); - boolean is_fep_compatible(in FlowEndPoint fep) + boolean is_fep_compatible(in FlowEndPoint fep) raises (formatMismatch, deviceQosMismatch); boolean set_peer(in FlowConnection the_fc, @@ -679,7 +679,7 @@ module AVStreams inout string flowProtocol)// syntax <flowProtocol> // The out value of flowProtocol contains SFP version // supported and all options including "Credit". - raises(failedToListen, AVStreams::FPError, + raises(failedToListen, AVStreams::FPError, AVStreams::QoSRequestFailed); }; @@ -758,7 +758,7 @@ module AVStreams /** * @interface MediaControl - * @brief MediaControl interface is similar to ControlledStream + * @brief MediaControl interface is similar to ControlledStream * interface in MSS. It can be inherited by flow endpoints or * FlowConnection interfaces. */ diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl index ea2acff3844..d1ed6a3bf82 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl @@ -25,7 +25,7 @@ #ifndef TAO_LIFECYCLE_IDL #define TAO_LIFECYCLE_IDL -// OMG IDL for CosLifeCycle Module, page 6-10 in +// OMG IDL for CosLifeCycle Module, page 6-10 in // Includes the following interfaces: // FactoryFinder, LifeCycleObject, GenericFactory @@ -40,21 +40,21 @@ module CosLifeCycle // // = DESCRIPTION // This idl file describes the life cycle service. - // The purpose of the life cycle service is to - - typedef CosNaming::Name Key; + // The purpose of the life cycle service is to + + typedef CosNaming::Name Key; typedef Object _Factory; typedef sequence <_Factory> Factories; struct NameValuePair { - CosNaming::Istring name; - any value; + CosNaming::Istring name; + any value; }; typedef sequence <NameValuePair> Criteria; - - exception NoFactory + + exception NoFactory { Key search_key; }; @@ -65,12 +65,12 @@ module CosLifeCycle { Criteria invalid_criteria; }; - exception CannotMeetCriteria + exception CannotMeetCriteria { Criteria unmet_criteria; }; - - interface FactoryFinder + + interface FactoryFinder { // = TITLE // @@ Please fill in. @@ -80,25 +80,25 @@ module CosLifeCycle Factories find_factories (in Key factory_key) raises (NoFactory); }; - - interface LifeCycleObject + + interface LifeCycleObject { // = TITLE // @@ Please fill in. // = DESCRIPTION // @@ Please fill in. - LifeCycleObject copy (in FactoryFinder there, + LifeCycleObject copy (in FactoryFinder there, in Criteria the_criteria) raises (NoFactory, NotCopyable, InvalidCriteria, CannotMeetCriteria); - void move (in FactoryFinder there, + void move (in FactoryFinder there, in Criteria the_criteria) raises (NoFactory, NotMovable, InvalidCriteria, CannotMeetCriteria); void remove () raises (NotRemovable); }; - - interface GenericFactory + + interface GenericFactory { // = TITLE // @@ Please fill in. @@ -106,7 +106,7 @@ module CosLifeCycle // @@ Please fill in. boolean _supports (in Key k); - Object create_object (in Key k, + Object create_object (in Key k, in Criteria the_criteria) raises (NoFactory, InvalidCriteria, CannotMeetCriteria); }; @@ -114,9 +114,9 @@ module CosLifeCycle // Criteria, page 6-17: /* -typedef struct NVP +typedef struct NVP { - CosNaming::Istring name; + CosNaming::Istring name; any value; } NameValuePair; diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl index f204eb5bddd..e922b1db251 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.idl +++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl @@ -201,23 +201,23 @@ module CosTrading { case some: PropertyNameSeq prop_names; }; - + exception IllegalPreference { Preference pref; }; - + exception IllegalPolicyName { PolicyName name; }; - + exception PolicyTypeMismatch { Policy the_policy; }; - + exception InvalidPolicyValue { Policy the_policy; }; - + void query (in ServiceTypeName type, in Constraint constr, in Preference pref, @@ -238,9 +238,9 @@ module CosTrading DuplicatePropertyName, DuplicatePolicyName); }; - + interface Register : TraderComponents, SupportAttributes - { + { struct OfferInfo { Object reference; @@ -251,42 +251,42 @@ module CosTrading exception InvalidObjectRef { Object ref; }; - + exception UnknownPropertyName { PropertyName name; }; - + exception InterfaceTypeMismatch { ServiceTypeName type; Object reference; }; - + exception ProxyOfferId { OfferId id; }; - + exception MandatoryProperty { ServiceTypeName type; PropertyName name; }; - + exception ReadonlyProperty { ServiceTypeName type; PropertyName name; }; - + exception NoMatchingOffers { Constraint constr; }; - + exception IllegalTraderName { TraderName name; }; - + exception UnknownTraderName { TraderName name; }; - + exception RegisterNotSupported { TraderName name; }; @@ -308,7 +308,7 @@ module CosTrading raises (IllegalOfferId, UnknownOfferId, ProxyOfferId); - + OfferInfo describe (in OfferId id) raises (IllegalOfferId, UnknownOfferId, @@ -355,25 +355,25 @@ module CosTrading exception IllegalLinkName { LinkName name; }; - + exception UnknownLinkName { LinkName name; }; - + exception DuplicateLinkName { LinkName name; }; - + exception DefaultFollowTooPermissive { FollowOption def_pass_on_follow_rule; FollowOption limiting_follow_rule; }; - + exception LimitingFollowTooPermissive { FollowOption limiting_follow_rule; FollowOption max_link_follow_policy; }; - + void add_link (in LinkName name, in Lookup target, in FollowOption def_pass_on_follow_rule, @@ -406,7 +406,7 @@ module CosTrading interface Proxy : TraderComponents, SupportAttributes { typedef Istring ConstraintRecipe; - + struct ProxyInfo { ServiceTypeName type; @@ -420,11 +420,11 @@ module CosTrading exception IllegalRecipe { ConstraintRecipe recipe; }; - + exception NotProxyOfferId { OfferId id; }; - + OfferId export_proxy (in Lookup target, in ServiceTypeName type, in PropertySeq properties, @@ -446,46 +446,46 @@ module CosTrading raises (IllegalOfferId, UnknownOfferId, NotProxyOfferId); - + ProxyInfo describe_proxy (in OfferId id) raises (IllegalOfferId, UnknownOfferId, NotProxyOfferId); }; - + interface Admin : TraderComponents, SupportAttributes, ImportAttributes, LinkAttributes - { + { typedef sequence<octet> OctetSeq; - + readonly attribute OctetSeq request_id_stem; - + unsigned long set_def_search_card (in unsigned long value); unsigned long set_max_search_card (in unsigned long value); - + unsigned long set_def_match_card (in unsigned long value); unsigned long set_max_match_card (in unsigned long value); - + unsigned long set_def_return_card (in unsigned long value); unsigned long set_max_return_card (in unsigned long value); - + unsigned long set_max_list (in unsigned long value); - + boolean set_supports_modifiable_properties (in boolean value); boolean set_supports_dynamic_properties (in boolean value); boolean set_supports_proxy_offers (in boolean value); - + unsigned long set_def_hop_count (in unsigned long value); unsigned long set_max_hop_count (in unsigned long value); - + FollowOption set_def_follow_policy (in FollowOption policy); FollowOption set_max_follow_policy (in FollowOption policy); - + FollowOption set_max_link_follow_policy (in FollowOption policy); - + TypeRepository set_type_repos (in TypeRepository repository); - + OctetSeq set_request_id_stem (in OctetSeq stem); - + void list_offers (in unsigned long how_many, out OfferIdSeq ids, out OfferIdIterator id_itr) @@ -512,13 +512,13 @@ module CosTrading { unsigned long max_left () raises (UnknownMaxLeft); - + boolean next_n (in unsigned long n, out OfferIdSeq ids); void destroy (); }; - + }; /* end module CosTrading */ #endif /* TAO_TRADING_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl b/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl index 27ffedbbf35..75534059f6d 100644 --- a/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl +++ b/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl @@ -25,15 +25,15 @@ module CosTradingDynamic { - + exception DPEvalFailure { CosTrading::PropertyName name; CORBA::TypeCode returned_type; any extra_info; }; - + interface DynamicPropEval - { + { any evalDP (in CosTrading::PropertyName name, in CORBA::TypeCode returned_type, in any extra_info) diff --git a/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl b/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl index 0462030155e..0edde8f9a89 100644 --- a/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl +++ b/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl @@ -26,7 +26,7 @@ module CosTradingRepos { interface ServiceTypeRepository - { + { // local types typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq; enum PropertyMode { @@ -40,7 +40,7 @@ module CosTradingRepos PropertyMode mode; }; typedef sequence<PropStruct> PropStructSeq; - + typedef CosTrading::Istring Identifier; // IR::Identifier struct IncarnationNumber @@ -99,10 +99,10 @@ module CosTradingRepos exception DuplicateServiceTypeName { CosTrading::ServiceTypeName name; }; - + // attributes readonly attribute IncarnationNumber incarnation; - + // operation signatures IncarnationNumber add_type (in CosTrading::ServiceTypeName name, in Identifier if_name, @@ -121,7 +121,7 @@ module CosTradingRepos raises (CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, HasSubTypes); - + ServiceTypeNameSeq list_types (in SpecifiedServiceTypes which_types); TypeStruct describe_type (in CosTrading::ServiceTypeName name) @@ -140,7 +140,7 @@ module CosTradingRepos void unmask_type (in CosTrading::ServiceTypeName name) raises (CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, - NotMasked); + NotMasked); }; }; /* end module CosTradingRepos */ diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.idl b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.idl index a4f32040b3f..57c5b44cb01 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.idl @@ -50,7 +50,7 @@ module DsEventLogAdmin DsLogAdmin::InvalidThreshold); }; - + }; #endif /* DS_EVENT_LOG_ADMIN_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl index c1bc5787c57..ea4a9f2bf1e 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.idl @@ -60,7 +60,7 @@ module DsNotifyLogAdmin CosNotification::UnsupportedQoS, CosNotification::UnsupportedAdmin); }; - + }; #endif /* DS_NOTIFY_LOG_ADMIN_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl index 6e5b54fb0a3..89900d54216 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl @@ -10,7 +10,7 @@ ACE_INLINE TAO_EC_TPC_ProxyPushSupplier::TAO_EC_TPC_ProxyPushSupplier (TAO_EC_Event_Channel_Base* ec, int validate_connection) : TAO_EC_Default_ProxyPushSupplier (ec, validate_connection) { - if (TAO_EC_TPC_debug_level > 0) + if (TAO_EC_TPC_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) EC_TPC_ProxyPushSupplier::CTOR (%@)\n", this)); } diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index c5784970559..b1e7680abe7 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -5,7 +5,7 @@ #include "orbsvcs/HTIOP/HTIOP_Profile.h" #include "ace/HTBP/HTBP_Environment.h" #include "ace/HTBP/HTBP_ID_Requestor.h" -#include "ace/os_include/os_netdb.h" +#include "ace/os_include/os_netdb.h" #include "tao/MProfile.h" #include "tao/ORB_Core.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp index 0d7d8876a30..73e5913309b 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.cpp @@ -7,7 +7,7 @@ #include "ace/HTBP/HTBP_Stream.h" #include "ace/HTBP/HTBP_Session.h" -#include "ace/os_include/os_netdb.h" +#include "ace/os_include/os_netdb.h" #include "tao/Timeprobe.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp index bd51a20b575..b822ade33df 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp @@ -121,7 +121,7 @@ namespace TAO CORBA::Contained_ptr, CORBA::Contained_var, CORBA::Contained_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -179,7 +179,7 @@ namespace TAO CORBA::Container_ptr, CORBA::Container_var, CORBA::Container_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -197,7 +197,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::Container::DescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -217,7 +217,7 @@ namespace TAO CORBA::ModuleDef_ptr, CORBA::ModuleDef_var, CORBA::ModuleDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -237,7 +237,7 @@ namespace TAO CORBA::ConstantDef_ptr, CORBA::ConstantDef_var, CORBA::ConstantDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -277,7 +277,7 @@ namespace TAO CORBA::StructDef_ptr, CORBA::StructDef_var, CORBA::StructDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -297,7 +297,7 @@ namespace TAO CORBA::UnionDef_ptr, CORBA::UnionDef_var, CORBA::UnionDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -357,7 +357,7 @@ namespace TAO CORBA::InterfaceDef_ptr, CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -435,7 +435,7 @@ namespace TAO CORBA::ValueDef_ptr, CORBA::ValueDef_var, CORBA::ValueDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -453,7 +453,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -473,7 +473,7 @@ namespace TAO CORBA::ValueBoxDef_ptr, CORBA::ValueBoxDef_var, CORBA::ValueBoxDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -493,7 +493,7 @@ namespace TAO CORBA::AbstractInterfaceDef_ptr, CORBA::AbstractInterfaceDef_var, CORBA::AbstractInterfaceDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -511,7 +511,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::AbstractInterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -531,7 +531,7 @@ namespace TAO CORBA::LocalInterfaceDef_ptr, CORBA::LocalInterfaceDef_var, CORBA::LocalInterfaceDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -551,7 +551,7 @@ namespace TAO CORBA::ExtValueDef_ptr, CORBA::ExtValueDef_var, CORBA::ExtValueDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -569,7 +569,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ContainedSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -587,7 +587,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::StructMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -605,7 +605,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -623,7 +623,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -641,7 +641,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::UnionMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -659,7 +659,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::EnumMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -700,7 +700,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -721,7 +721,7 @@ namespace TAO CORBA::Contained_var, CORBA::Contained_out, TAO::Objref_Traits<CORBA::Contained>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -739,7 +739,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::Contained::Description, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -760,7 +760,7 @@ namespace TAO CORBA::Repository_var, CORBA::Repository_out, TAO::Objref_Traits<CORBA::Repository>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -781,7 +781,7 @@ namespace TAO CORBA::Container_var, CORBA::Container_out, TAO::Objref_Traits<CORBA::Container>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -799,7 +799,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::Container::DescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -820,7 +820,7 @@ namespace TAO CORBA::ModuleDef_var, CORBA::ModuleDef_out, TAO::Objref_Traits<CORBA::ModuleDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -841,7 +841,7 @@ namespace TAO CORBA::ConstantDef_var, CORBA::ConstantDef_out, TAO::Objref_Traits<CORBA::ConstantDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -862,7 +862,7 @@ namespace TAO CORBA::IDLType_var, CORBA::IDLType_out, TAO::Objref_Traits<CORBA::IDLType>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -883,7 +883,7 @@ namespace TAO CORBA::StructDef_var, CORBA::StructDef_out, TAO::Objref_Traits<CORBA::StructDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -904,7 +904,7 @@ namespace TAO CORBA::UnionDef_var, CORBA::UnionDef_out, TAO::Objref_Traits<CORBA::UnionDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -925,7 +925,7 @@ namespace TAO CORBA::EnumDef_var, CORBA::EnumDef_out, TAO::Objref_Traits<CORBA::EnumDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -946,7 +946,7 @@ namespace TAO CORBA::AliasDef_var, CORBA::AliasDef_out, TAO::Objref_Traits<CORBA::AliasDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -967,7 +967,7 @@ namespace TAO CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, TAO::Objref_Traits<CORBA::InterfaceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -985,7 +985,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1006,7 +1006,7 @@ namespace TAO CORBA::ExceptionDef_var, CORBA::ExceptionDef_out, TAO::Objref_Traits<CORBA::ExceptionDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1027,7 +1027,7 @@ namespace TAO CORBA::NativeDef_var, CORBA::NativeDef_out, TAO::Objref_Traits<CORBA::NativeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1048,7 +1048,7 @@ namespace TAO CORBA::ValueDef_var, CORBA::ValueDef_out, TAO::Objref_Traits<CORBA::ValueDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1066,7 +1066,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1087,7 +1087,7 @@ namespace TAO CORBA::ValueBoxDef_var, CORBA::ValueBoxDef_out, TAO::Objref_Traits<CORBA::ValueBoxDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1108,7 +1108,7 @@ namespace TAO CORBA::AbstractInterfaceDef_var, CORBA::AbstractInterfaceDef_out, TAO::Objref_Traits<CORBA::AbstractInterfaceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1126,7 +1126,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::AbstractInterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1147,7 +1147,7 @@ namespace TAO CORBA::LocalInterfaceDef_var, CORBA::LocalInterfaceDef_out, TAO::Objref_Traits<CORBA::LocalInterfaceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1168,7 +1168,7 @@ namespace TAO CORBA::ExtValueDef_var, CORBA::ExtValueDef_out, TAO::Objref_Traits<CORBA::ExtValueDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1186,7 +1186,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ContainedSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1204,7 +1204,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::StructMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1222,7 +1222,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1240,7 +1240,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1258,7 +1258,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::UnionMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1276,7 +1276,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::EnumMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp index eb850447fe4..003a4e8aadf 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_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:683 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASES_T_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp index 9d26126d9b6..fee74e54747 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp @@ -101,7 +101,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -121,7 +121,7 @@ namespace TAO CORBA::Contained_ptr, CORBA::Contained_var, CORBA::Contained_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -141,7 +141,7 @@ namespace TAO CORBA::Repository_ptr, CORBA::Repository_var, CORBA::Repository_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -161,7 +161,7 @@ namespace TAO CORBA::Container_ptr, CORBA::Container_var, CORBA::Container_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -181,7 +181,7 @@ namespace TAO CORBA::IDLType_ptr, CORBA::IDLType_var, CORBA::IDLType_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -199,7 +199,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -217,7 +217,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::StructMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -235,7 +235,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExcDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -253,7 +253,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::UnionMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -271,7 +271,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::EnumMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -291,7 +291,7 @@ namespace TAO CORBA::PrimitiveDef_ptr, CORBA::PrimitiveDef_var, CORBA::PrimitiveDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -311,7 +311,7 @@ namespace TAO CORBA::StringDef_ptr, CORBA::StringDef_var, CORBA::StringDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -331,7 +331,7 @@ namespace TAO CORBA::SequenceDef_ptr, CORBA::SequenceDef_var, CORBA::SequenceDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -351,7 +351,7 @@ namespace TAO CORBA::ArrayDef_ptr, CORBA::ArrayDef_var, CORBA::ArrayDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -371,7 +371,7 @@ namespace TAO CORBA::WstringDef_ptr, CORBA::WstringDef_var, CORBA::WstringDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -391,7 +391,7 @@ namespace TAO CORBA::FixedDef_ptr, CORBA::FixedDef_var, CORBA::FixedDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -409,7 +409,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::PrimitiveKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -427,7 +427,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -445,7 +445,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::AttributeMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -465,7 +465,7 @@ namespace TAO CORBA::AttributeDef_ptr, CORBA::AttributeDef_var, CORBA::AttributeDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -483,7 +483,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExtAttributeDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -503,7 +503,7 @@ namespace TAO CORBA::ExtAttributeDef_ptr, CORBA::ExtAttributeDef_var, CORBA::ExtAttributeDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -521,7 +521,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -539,7 +539,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -557,7 +557,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -577,7 +577,7 @@ namespace TAO CORBA::OperationDef_ptr, CORBA::OperationDef_var, CORBA::OperationDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -595,7 +595,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InterfaceDef::FullInterfaceDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -613,7 +613,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -654,7 +654,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -675,7 +675,7 @@ namespace TAO CORBA::Contained_var, CORBA::Contained_out, TAO::Objref_Traits<CORBA::Contained>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -696,7 +696,7 @@ namespace TAO CORBA::Repository_var, CORBA::Repository_out, TAO::Objref_Traits<CORBA::Repository>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -717,7 +717,7 @@ namespace TAO CORBA::Container_var, CORBA::Container_out, TAO::Objref_Traits<CORBA::Container>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -738,7 +738,7 @@ namespace TAO CORBA::IDLType_var, CORBA::IDLType_out, TAO::Objref_Traits<CORBA::IDLType>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -756,7 +756,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -774,7 +774,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::StructMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -792,7 +792,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExcDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -810,7 +810,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::UnionMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -828,7 +828,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::EnumMemberSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -849,7 +849,7 @@ namespace TAO CORBA::PrimitiveDef_var, CORBA::PrimitiveDef_out, TAO::Objref_Traits<CORBA::PrimitiveDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -870,7 +870,7 @@ namespace TAO CORBA::StringDef_var, CORBA::StringDef_out, TAO::Objref_Traits<CORBA::StringDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -891,7 +891,7 @@ namespace TAO CORBA::SequenceDef_var, CORBA::SequenceDef_out, TAO::Objref_Traits<CORBA::SequenceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -912,7 +912,7 @@ namespace TAO CORBA::ArrayDef_var, CORBA::ArrayDef_out, TAO::Objref_Traits<CORBA::ArrayDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -933,7 +933,7 @@ namespace TAO CORBA::WstringDef_var, CORBA::WstringDef_out, TAO::Objref_Traits<CORBA::WstringDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -954,7 +954,7 @@ namespace TAO CORBA::FixedDef_var, CORBA::FixedDef_out, TAO::Objref_Traits<CORBA::FixedDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -972,7 +972,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::PrimitiveKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -990,7 +990,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1008,7 +1008,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::AttributeMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1029,7 +1029,7 @@ namespace TAO CORBA::AttributeDef_var, CORBA::AttributeDef_out, TAO::Objref_Traits<CORBA::AttributeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1047,7 +1047,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExtAttributeDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1068,7 +1068,7 @@ namespace TAO CORBA::ExtAttributeDef_var, CORBA::ExtAttributeDef_out, TAO::Objref_Traits<CORBA::ExtAttributeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1086,7 +1086,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1104,7 +1104,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1122,7 +1122,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1143,7 +1143,7 @@ namespace TAO CORBA::OperationDef_var, CORBA::OperationDef_out, TAO::Objref_Traits<CORBA::OperationDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1161,7 +1161,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceDef::FullInterfaceDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1179,7 +1179,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp index d95b6d48dac..41877f34ad5 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_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:683 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_BASICS_T_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp index 08f1b3492b4..cdbe6ff4520 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp @@ -119,7 +119,7 @@ namespace TAO CORBA::Repository_ptr, CORBA::Repository_var, CORBA::Repository_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -139,7 +139,7 @@ namespace TAO CORBA::Container_ptr, CORBA::Container_var, CORBA::Container_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -159,7 +159,7 @@ namespace TAO CORBA::IDLType_ptr, CORBA::IDLType_var, CORBA::IDLType_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -177,7 +177,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -195,7 +195,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -213,7 +213,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -231,7 +231,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -249,7 +249,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -267,7 +267,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -285,7 +285,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -303,7 +303,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -323,7 +323,7 @@ namespace TAO CORBA::InterfaceDef_ptr, CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -343,7 +343,7 @@ namespace TAO CORBA::ValueDef_ptr, CORBA::ValueDef_var, CORBA::ValueDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -363,7 +363,7 @@ namespace TAO CORBA::ComponentIR::ComponentDef_ptr, CORBA::ComponentIR::ComponentDef_var, CORBA::ComponentIR::ComponentDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -383,7 +383,7 @@ namespace TAO CORBA::ComponentIR::HomeDef_ptr, CORBA::ComponentIR::HomeDef_var, CORBA::ComponentIR::HomeDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -403,7 +403,7 @@ namespace TAO CORBA::ComponentIR::EventDef_ptr, CORBA::ComponentIR::EventDef_var, CORBA::ComponentIR::EventDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -423,7 +423,7 @@ namespace TAO CORBA::ComponentIR::ProvidesDef_ptr, CORBA::ComponentIR::ProvidesDef_var, CORBA::ComponentIR::ProvidesDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -443,7 +443,7 @@ namespace TAO CORBA::ComponentIR::UsesDef_ptr, CORBA::ComponentIR::UsesDef_var, CORBA::ComponentIR::UsesDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -463,7 +463,7 @@ namespace TAO CORBA::ComponentIR::EmitsDef_ptr, CORBA::ComponentIR::EmitsDef_var, CORBA::ComponentIR::EmitsDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -483,7 +483,7 @@ namespace TAO CORBA::ComponentIR::PublishesDef_ptr, CORBA::ComponentIR::PublishesDef_var, CORBA::ComponentIR::PublishesDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -503,7 +503,7 @@ namespace TAO CORBA::ComponentIR::ConsumesDef_ptr, CORBA::ComponentIR::ConsumesDef_var, CORBA::ComponentIR::ConsumesDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -523,7 +523,7 @@ namespace TAO CORBA::ComponentIR::FactoryDef_ptr, CORBA::ComponentIR::FactoryDef_var, CORBA::ComponentIR::FactoryDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -543,7 +543,7 @@ namespace TAO CORBA::ComponentIR::FinderDef_ptr, CORBA::ComponentIR::FinderDef_var, CORBA::ComponentIR::FinderDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -584,7 +584,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -605,7 +605,7 @@ namespace TAO CORBA::Repository_var, CORBA::Repository_out, TAO::Objref_Traits<CORBA::Repository>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -626,7 +626,7 @@ namespace TAO CORBA::Container_var, CORBA::Container_out, TAO::Objref_Traits<CORBA::Container>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -647,7 +647,7 @@ namespace TAO CORBA::IDLType_var, CORBA::IDLType_out, TAO::Objref_Traits<CORBA::IDLType>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -665,7 +665,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -683,7 +683,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -701,7 +701,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -719,7 +719,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -737,7 +737,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -755,7 +755,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -773,7 +773,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -791,7 +791,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -812,7 +812,7 @@ namespace TAO CORBA::InterfaceDef_var, CORBA::InterfaceDef_out, TAO::Objref_Traits<CORBA::InterfaceDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -833,7 +833,7 @@ namespace TAO CORBA::ValueDef_var, CORBA::ValueDef_out, TAO::Objref_Traits<CORBA::ValueDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -854,7 +854,7 @@ namespace TAO CORBA::ComponentIR::ComponentDef_var, CORBA::ComponentIR::ComponentDef_out, TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -875,7 +875,7 @@ namespace TAO CORBA::ComponentIR::HomeDef_var, CORBA::ComponentIR::HomeDef_out, TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -896,7 +896,7 @@ namespace TAO CORBA::ComponentIR::EventDef_var, CORBA::ComponentIR::EventDef_out, TAO::Objref_Traits<CORBA::ComponentIR::EventDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -917,7 +917,7 @@ namespace TAO CORBA::ComponentIR::ProvidesDef_var, CORBA::ComponentIR::ProvidesDef_out, TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -938,7 +938,7 @@ namespace TAO CORBA::ComponentIR::UsesDef_var, CORBA::ComponentIR::UsesDef_out, TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -959,7 +959,7 @@ namespace TAO CORBA::ComponentIR::EmitsDef_var, CORBA::ComponentIR::EmitsDef_out, TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -980,7 +980,7 @@ namespace TAO CORBA::ComponentIR::PublishesDef_var, CORBA::ComponentIR::PublishesDef_out, TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1001,7 +1001,7 @@ namespace TAO CORBA::ComponentIR::ConsumesDef_var, CORBA::ComponentIR::ConsumesDef_out, TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1022,7 +1022,7 @@ namespace TAO CORBA::ComponentIR::FactoryDef_var, CORBA::ComponentIR::FactoryDef_out, TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -1043,7 +1043,7 @@ namespace TAO CORBA::ComponentIR::FinderDef_var, CORBA::ComponentIR::FinderDef_out, TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp index 1944c42347d..0dfc2fdd182 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_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:683 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_COMPONENTSS_T_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp index 6a1b674154a..582234ac51d 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp @@ -99,7 +99,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -119,7 +119,7 @@ namespace TAO CORBA::Repository_ptr, CORBA::Repository_var, CORBA::Repository_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -139,7 +139,7 @@ namespace TAO CORBA::Container_ptr, CORBA::Container_var, CORBA::Container_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -159,7 +159,7 @@ namespace TAO CORBA::IDLType_ptr, CORBA::IDLType_var, CORBA::IDLType_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -177,7 +177,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -195,7 +195,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -213,7 +213,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -231,7 +231,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -249,7 +249,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -267,7 +267,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::AttributeMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -287,7 +287,7 @@ namespace TAO CORBA::AttributeDef_ptr, CORBA::AttributeDef_var, CORBA::AttributeDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -307,7 +307,7 @@ namespace TAO CORBA::ExtAttributeDef_ptr, CORBA::ExtAttributeDef_var, CORBA::ExtAttributeDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -325,7 +325,7 @@ namespace TAO : public Basic_SArg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -343,7 +343,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -361,7 +361,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -381,7 +381,7 @@ namespace TAO CORBA::OperationDef_ptr, CORBA::OperationDef_var, CORBA::OperationDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -401,7 +401,7 @@ namespace TAO CORBA::ValueMemberDef_ptr, CORBA::ValueMemberDef_var, CORBA::ValueMemberDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -421,7 +421,7 @@ namespace TAO CORBA::ValueDef_ptr, CORBA::ValueDef_var, CORBA::ValueDef_out, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -439,7 +439,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ValueDef::FullValueDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -457,7 +457,7 @@ namespace TAO : public Var_Size_SArg_Traits_T< CORBA::ExtValueDef::ExtFullValueDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -498,7 +498,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::DefinitionKind, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -519,7 +519,7 @@ namespace TAO CORBA::Repository_var, CORBA::Repository_out, TAO::Objref_Traits<CORBA::Repository>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -540,7 +540,7 @@ namespace TAO CORBA::Container_var, CORBA::Container_out, TAO::Objref_Traits<CORBA::Container>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -561,7 +561,7 @@ namespace TAO CORBA::IDLType_var, CORBA::IDLType_out, TAO::Objref_Traits<CORBA::IDLType>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -579,7 +579,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InterfaceDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -597,7 +597,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ValueDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -615,7 +615,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::InitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -633,7 +633,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExtInitializerSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -651,7 +651,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExceptionDefSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -669,7 +669,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::AttributeMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -690,7 +690,7 @@ namespace TAO CORBA::AttributeDef_var, CORBA::AttributeDef_out, TAO::Objref_Traits<CORBA::AttributeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -711,7 +711,7 @@ namespace TAO CORBA::ExtAttributeDef_var, CORBA::ExtAttributeDef_out, TAO::Objref_Traits<CORBA::ExtAttributeDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -729,7 +729,7 @@ namespace TAO : public Basic_Arg_Traits_T< CORBA::OperationMode, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -747,7 +747,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ParDescriptionSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -765,7 +765,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ContextIdSeq, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -786,7 +786,7 @@ namespace TAO CORBA::OperationDef_var, CORBA::OperationDef_out, TAO::Objref_Traits<CORBA::OperationDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -807,7 +807,7 @@ namespace TAO CORBA::ValueMemberDef_var, CORBA::ValueMemberDef_out, TAO::Objref_Traits<CORBA::ValueMemberDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -828,7 +828,7 @@ namespace TAO CORBA::ValueDef_var, CORBA::ValueDef_out, TAO::Objref_Traits<CORBA::ValueDef>, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -846,7 +846,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ValueDef::FullValueDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; @@ -864,7 +864,7 @@ namespace TAO : public Var_Size_Arg_Traits_T< CORBA::ExtValueDef::ExtFullValueDescription, - TAO::Any_Insert_Policy_Stream + TAO::Any_Insert_Policy_Stream > { }; diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp index 9bd6f99cb35..b84c9e4a9f1 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_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:683 #ifndef _TAO_IDL____ORBSVCS_ORBSVCS_IFRSERVICE_IFR_EXTENDEDS_T_CPP_ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp index 5ab0688af0a..8f2b142f342 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp @@ -80,7 +80,7 @@ TAO_Notify_CosEC_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp index 4c8facc1db0..9603d8a9636 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp @@ -57,7 +57,7 @@ TAO_Notify_CosEC_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_CosEC_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp index e2c87b4b247..92362902145 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp @@ -83,7 +83,7 @@ TAO_Notify_ProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp index 8d5e1c63841..aae6d178396 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp @@ -65,7 +65,7 @@ TAO_Notify_ProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_ProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 477576149ab..3f794fd2c7f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -748,8 +748,8 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer) { // The consumer may not connected or the consumer did // not provide a callback. In this case, the liveliness - // check should return true so it will be validated in - // next period. + // check should return true so it will be validated in + // next period. if (allow_nil_consumer) return true; else @@ -789,12 +789,12 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer) for (CORBA::ULong i = 0; i < policy_list.length (); i++) policy_list[i]->destroy (); - do_liveliness_check - = (last_ping_ == ACE_Time_Value::zero ? true + do_liveliness_check + = (last_ping_ == ACE_Time_Value::zero ? true : now - last_ping_.value () >= TAO_Notify_PROPERTIES::instance()->validate_client_delay ()); } else - do_liveliness_check = + do_liveliness_check = now - last_ping_.value () >= TAO_Notify_PROPERTIES::instance()->validate_client_interval (); if (CORBA::is_nil (rtt_obj_.in ())) @@ -814,7 +814,7 @@ TAO_Notify_Consumer::is_alive (bool allow_nil_consumer) catch (CORBA::Exception& ex) { if (DEBUG_LEVEL > 0) - { + { ex._tao_print_exception ("TAO_Notify_Consumer::is_alive: false"); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index 0c54b5550bb..4ce532c053d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -19,7 +19,7 @@ TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void) : TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory () { FILTERMAP::ITERATOR iterator (this->filters_); - + for (FILTERMAP::ENTRY *entry = 0; iterator.next (entry) != 0; iterator.advance ()) @@ -101,8 +101,8 @@ TAO_Notify_ETCL_FilterFactory::create_filter ( filter = 0; ACE_NEW_THROW_EX (filter, - TAO_Notify_ETCL_Filter (this->filter_poa_.in (), - constraint_grammar, + TAO_Notify_ETCL_Filter (this->filter_poa_.in (), + constraint_grammar, id), CORBA::NO_MEMORY ()); @@ -110,8 +110,8 @@ TAO_Notify_ETCL_FilterFactory::create_filter ( { throw CORBA::INTERNAL (); return 0; - } - + } + PortableServer::ObjectId_var oid; try { @@ -145,7 +145,7 @@ TAO_Notify_ETCL_FilterFactory::create_mapping_filter (const char * /*constraint_ TAO_END_VERSIONED_NAMESPACE_DECL -void +void TAO_Notify_ETCL_FilterFactory::save_persistent (TAO_Notify::Topology_Saver& saver) { bool changed = true; @@ -182,7 +182,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, if (attrs.find ("FilterId", value)) { TAO_Notify_Object::ID const id = ACE_OS::atoi (value); - if (DEBUG_LEVEL) + if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) reload filter %d\n"), static_cast<int> (id) @@ -193,7 +193,7 @@ TAO_Notify_ETCL_FilterFactory::load_child (const ACE_CString &type, TAO_Notify_ETCL_Filter* filter = 0; this->create_filter (0, id, filter); filter->load_attrs (attrs); - + return filter; } } @@ -209,10 +209,10 @@ TAO_Notify_ETCL_FilterFactory::release (void) } -TAO_Notify_Object::ID +TAO_Notify_Object::ID TAO_Notify_ETCL_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr filter) { - ::PortableServer::Servant svt + ::PortableServer::Servant svt = this->filter_poa_->reference_to_servant (filter); FILTERMAP::ITERATOR iterator (this->filters_); @@ -230,7 +230,7 @@ TAO_Notify_ETCL_FilterFactory::get_filter_id (CosNotifyFilter::Filter_ptr filter } -CosNotifyFilter::Filter_ptr +CosNotifyFilter::Filter_ptr TAO_Notify_ETCL_FilterFactory::get_filter (const TAO_Notify_Object::ID& id) { TAO_Notify_ETCL_Filter* filter = 0; @@ -241,7 +241,7 @@ TAO_Notify_ETCL_FilterFactory::get_filter (const TAO_Notify_Object::ID& id) CORBA::Object_var obj = this->filter_poa_->servant_to_reference (filter); - CosNotifyFilter::Filter_var filter + CosNotifyFilter::Filter_var filter = CosNotifyFilter::Filter::_narrow (obj.in ()); return filter._retn (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp index 1295f62a82d..922b871eeaa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp @@ -110,7 +110,7 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf this->set_admin (initial_admin); - PortableServer::POA_var default_poa = + PortableServer::POA_var default_poa = TAO_Notify_PROPERTIES::instance ()->default_poa (); this->default_filter_factory_ = @@ -454,7 +454,7 @@ TAO_Notify_EventChannel::save_persistent (TAO_Notify::Topology_Saver& saver) bool want_all_children = saver.begin_object( this->id(), "channel", attrs, changed); - + this->default_filter_factory_servant_->save_persistent (saver); TAO_Notify::Save_Persist_Worker<TAO_Notify_ConsumerAdmin> ca_wrk(saver, want_all_children); @@ -511,7 +511,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, } else if (type == "consumer_admin") { - if (DEBUG_LEVEL) + if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload consumer_admin %d\n") , static_cast<int> (id) @@ -534,7 +534,7 @@ TAO_Notify_EventChannel::load_child (const ACE_CString &type, } else if (type == "supplier_admin") { - if (DEBUG_LEVEL) + if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) EventChannel reload supplier_admin %d\n") , static_cast<int> (id) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl index 3e69b9b475f..e2859f9c93b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl @@ -30,7 +30,7 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::find (const TAO_Notify_EventType& event for(Iterator_Type i = this->map_.begin (); i != end; ++i) { if ((*i).ext_id_ == event_type) - { + { entry = (*i).int_id_; entry->_incr_refcnt (); return entry; diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp index a8c98d5941a..6a4f41e219c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp @@ -162,7 +162,7 @@ TAO_Notify_FilterAdmin::load_child (const ACE_CString &type, CORBA::Long id, TAO_Notify_FilterFactory* factory = ec_->default_filter_factory_servant (); CosNotifyFilter::Filter_var filter = factory->get_filter (mapid); - + if (! CORBA::is_nil(filter.in())) { this->filter_ids_.set_last_used(id); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp index b9f4bd3d89e..1a29bd03d23 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp @@ -86,7 +86,7 @@ TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[]) // Force the ARGV_T to copy the elements added by the add() method this->task_.argv_.argv (); - + // Rember that Monitor has been configured this->initialized_ = true; return 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp index 309e82806a7..473b4e8d4d0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.cpp @@ -32,7 +32,7 @@ public: { CosNotifyChannelAdmin::ConsumerAdmin_var admin = this->ec_->get_consumeradmin (this->id_); - + if (!CORBA::is_nil (admin.in ())) { admin->destroy (); @@ -80,7 +80,7 @@ TAO_MonitorConsumerAdmin::register_stats_controls ( Monitor_Base (this->queue_size_stat_name_.c_str (), Monitor_Control_Types::MC_NUMBER), CORBA::NO_MEMORY ()); - + if (!mec->register_statistic (this->queue_size_stat_name_, this->queue_size_)) { // The constructor sets the refcount to 1 so this call will @@ -111,13 +111,13 @@ TAO_MonitorConsumerAdmin::register_stats_controls ( this->id ()), CORBA::NO_MEMORY ()); TAO_Control_Registry* cinstance = TAO_Control_Registry::instance (); - + if (!cinstance->add (control)) { delete control; ACE_ERROR ((LM_ERROR, "Unable to add control: %s\n", - this->control_name_.c_str ())); + this->control_name_.c_str ())); } } @@ -130,7 +130,7 @@ TAO_MonitorConsumerAdmin::obtain_named_notification_push_supplier ( // First, make sure we can get down to the real ec type. TAO_MonitorEventChannel* ec = dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ()); - + if (ec == 0) { throw CORBA::INTERNAL (); @@ -155,7 +155,7 @@ TAO_MonitorConsumerAdmin::obtain_notification_push_supplier ( // First, make sure we can get down to the real ec type. TAO_MonitorEventChannel* ec = dynamic_cast<TAO_MonitorEventChannel*> (this->ec_.get ()); - + if (ec == 0) { throw CORBA::INTERNAL (); @@ -219,14 +219,14 @@ TAO_MonitorConsumerAdmin::stat_name (void)const } -void +void TAO_MonitorConsumerAdmin::destroy (void) { this->remove (); this->TAO_Notify_ConsumerAdmin::destroy (); } -void +void TAO_MonitorConsumerAdmin::remove (void) { // First, make sure we can get down to the real ec type diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp index c2c6bf79371..6af8a90efe3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannel.cpp @@ -38,7 +38,7 @@ public: is_supplier_ (is_supplier) { } - + virtual void update (void) { if (this->type () == Monitor_Control_Types::MC_LIST) { @@ -57,7 +57,7 @@ public: this->receive (this->interf_->get_consumers (0)); } } - + private: bool is_supplier_; }; @@ -96,13 +96,13 @@ public: is_supplier_ (is_supplier) { } - + virtual void update (void) { if (this->type () == Monitor_Control_Types::MC_LIST) { Monitor_Control_Types::NameList list; - + if (this->is_supplier_) { this->interf_->get_supplieradmins (&list); @@ -111,11 +111,11 @@ public: { this->interf_->get_consumeradmins (&list); } - + this->receive (list); } else - { + { if (this->is_supplier_) { this->receive (this->interf_->get_supplieradmins (0)); @@ -186,7 +186,7 @@ public: type) { } - + virtual void update (void) { Monitor_Control_Types::NameList list; @@ -251,7 +251,7 @@ public: virtual bool execute (const char* command) { bool status = true; - + if (this->is_supplier_) { if (ACE_OS::strcmp (command, TAO_NS_CONTROL_REMOVE_SUPPLIER) == 0) @@ -299,10 +299,10 @@ TAO_MonitorEventChannel::TAO_MonitorEventChannel (const char* name) TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); - + Monitor_Point_Registry* instance = Monitor_Point_Registry::instance (); size_t size = this->stat_names_.size (); - + for (size_t i = 0; i < size; ++i) { instance->remove (this->stat_names_[i].c_str ()); @@ -310,7 +310,7 @@ TAO_MonitorEventChannel::~TAO_MonitorEventChannel (void) TAO_Control_Registry* cinstance = TAO_Control_Registry::instance (); size = this->control_names_.size (); - + for (size_t i = 0; i < size; ++i) { cinstance->remove (this->control_names_[i]); @@ -330,14 +330,14 @@ TAO_MonitorEventChannel::register_statistic (const ACE_CString& name, // Add the statistic to the registry and // add the name to the statistic names list. bool added = Monitor_Point_Registry::instance ()->add (stat); - + if (added) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->names_mutex_, added); - + this->stat_names_.push_back (name); } - + return added; } @@ -354,7 +354,7 @@ TAO_MonitorEventChannel::unregister_statistic (const ACE_CString& name) this->remove_list_name (this->stat_names_, name); } - + return removed; } @@ -369,9 +369,9 @@ TAO_MonitorEventChannel::map_supplier_proxy ( } ACE_CString full = this->name_ + "/" + name; - + ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplier_mutex_); - + if (this->is_duplicate_name (this->supplier_map_, full)) { throw NotifyMonitoringExt::NameAlreadyUsed (); @@ -391,11 +391,11 @@ TAO_MonitorEventChannel::map_supplier_proxy ( CORBA::NO_MEMORY ()); TAO_Control_Registry* cinstance = TAO_Control_Registry::instance (); - + if (cinstance->add (rcsc)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); - + this->control_names_.push_back (full); } else @@ -418,9 +418,9 @@ TAO_MonitorEventChannel::map_consumer_proxy ( } ACE_CString full = this->name_ + "/" + name; - + ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumer_mutex_); - + if (this->is_duplicate_name (this->consumer_map_, full)) { throw NotifyMonitoringExt::NameAlreadyUsed (); @@ -440,11 +440,11 @@ TAO_MonitorEventChannel::map_consumer_proxy ( CORBA::NO_MEMORY ()); TAO_Control_Registry* cinstance = TAO_Control_Registry::instance (); - + if (cinstance->add (rcsc)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); - + this->control_names_.push_back (full); } else @@ -462,11 +462,11 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id, bool experienced_timeout) { ACE_CString name; - + if (is_supplier) { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplier_mutex_); - + // It may seem like a good idea to throw a // NotifyMonitoringExt::NameMapError() exception if we can't unbind the // id from the map, but we can't. This method is called indirectly @@ -489,7 +489,7 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id, else { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumer_mutex_); - + // The same goes for this one too. this->consumer_map_.unbind (id, name); } @@ -500,7 +500,7 @@ TAO_MonitorEventChannel::cleanup_proxy (CosNotifyChannelAdmin::ProxyID id, cinstance->remove (name); ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); - + this->remove_list_name (this->control_names_, name); } } @@ -510,7 +510,7 @@ TAO_MonitorEventChannel::remove_consumeradmin ( CosNotifyChannelAdmin::ProxyID id) { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->consumeradmin_mutex_); - + this->consumeradmin_map_.unbind (id); } @@ -519,7 +519,7 @@ TAO_MonitorEventChannel::remove_supplieradmin ( CosNotifyChannelAdmin::ProxyID id) { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplieradmin_mutex_); - + this->supplieradmin_map_.unbind (id); } @@ -542,7 +542,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) CORBA::NO_MEMORY ()); ACE_Time_Value tv (ACE_OS::gettimeofday ()); timestamp->receive (tv.sec () + (tv.usec () / 1000000.0)); - + if (!this->register_statistic (stat_name, timestamp)) { ACE_ERROR ((LM_ERROR, @@ -562,7 +562,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) stat_name.c_str (), Monitor_Control_Types::MC_NUMBER), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, consumers)) { ACE_ERROR ((LM_ERROR, @@ -582,14 +582,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) stat_name.c_str (), Monitor_Control_Types::MC_LIST), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, consumers)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. consumers->remove_ref (); @@ -623,14 +623,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_NUMBER, true), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, suppliers)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. suppliers->remove_ref (); @@ -644,14 +644,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_LIST, true), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, suppliers)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. suppliers->remove_ref (); @@ -664,14 +664,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) stat_name.c_str (), Monitor_Control_Types::MC_NUMBER), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, conadmins)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. conadmins->remove_ref (); @@ -684,14 +684,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) stat_name.c_str (), Monitor_Control_Types::MC_LIST), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, conadmins)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. conadmins->remove_ref (); @@ -705,14 +705,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_NUMBER, true), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, supadmins)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. supadmins->remove_ref (); @@ -726,14 +726,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_LIST, true), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, supadmins)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. supadmins->remove_ref (); @@ -745,14 +745,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_NUMBER, false), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, events)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. events->remove_ref (); @@ -765,7 +765,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) Monitor_Control_Types::MC_NUMBER, true), CORBA::NO_MEMORY ()); - + events->add_to_registry (); events->remove_ref (); @@ -775,14 +775,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) OldestEvent (this, stat_name.c_str (), Monitor_Control_Types::MC_TIME), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, oldest)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. oldest->remove_ref (); @@ -794,14 +794,14 @@ TAO_MonitorEventChannel::add_stats (const char* name) stat_name.c_str (), Monitor_Control_Types::MC_LIST), CORBA::NO_MEMORY ()); - + if (!this->register_statistic (stat_name, slowest)) { ACE_ERROR ((LM_ERROR, "Unable to add statistic %s\n", stat_name.c_str ())); } - + // Registry manages refcount, so we do this regardless. slowest->remove_ref (); @@ -826,7 +826,7 @@ TAO_MonitorEventChannel::add_stats (const char* name) ShutdownControl (this, this->name_), CORBA::NO_MEMORY ()); - + if (cinstance->add (sd)) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->names_mutex_); @@ -867,7 +867,7 @@ TAO_MonitorEventChannel::named_new_for_consumers ( // WARNING: Internal knowledge of TAO. TAO_MonitorConsumerAdmin* low_admin = dynamic_cast<TAO_MonitorConsumerAdmin*> (admin->_servant ()); - + if (low_admin == 0) { // This shouldn't happen. @@ -877,7 +877,7 @@ TAO_MonitorEventChannel::named_new_for_consumers ( { // Build up the full name. ACE_CString full = this->name_ + "/"; - + if (name == 0) { char idname[64]; @@ -892,7 +892,7 @@ TAO_MonitorEventChannel::named_new_for_consumers ( ACE_WRITE_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard, this->consumeradmin_mutex_, CosNotifyChannelAdmin::ConsumerAdmin::_nil ()); - + if (this->is_duplicate_name (this->consumeradmin_map_, full)) { throw NotifyMonitoringExt::NameAlreadyUsed (); @@ -934,7 +934,7 @@ TAO_MonitorEventChannel::named_new_for_suppliers ( // WARNING: Internal knowledge of TAO. TAO_MonitorSupplierAdmin* low_admin = dynamic_cast<TAO_MonitorSupplierAdmin*> (admin->_servant ()); - + if (low_admin == 0) { // This shouldn't happen @@ -944,7 +944,7 @@ TAO_MonitorEventChannel::named_new_for_suppliers ( { // Build up the full name ACE_CString full = this->name_ + "/"; - + if (name == 0) { char idname[64]; @@ -984,18 +984,18 @@ TAO_MonitorEventChannel::get_consumers ( CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); CORBA::ULong length = conadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::ConsumerAdmin_var admin = this->get_consumeradmin (conadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { CosNotifyChannelAdmin::ProxyIDSeq_var proxys = admin->push_suppliers (); CORBA::ULong plen = proxys->length (); - + if (plen > 0) { ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, @@ -1015,7 +1015,7 @@ TAO_MonitorEventChannel::get_consumers ( else { ACE_CString name; - + if (this->supplier_map_.find (proxys[i], name) == 0) { count++; @@ -1026,7 +1026,7 @@ TAO_MonitorEventChannel::get_consumers ( } } } - + return count; } @@ -1053,18 +1053,18 @@ TAO_MonitorEventChannel::get_suppliers ( CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids = this->get_all_supplieradmins (); CORBA::ULong length = supadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::SupplierAdmin_var admin = this->get_supplieradmin (supadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { CosNotifyChannelAdmin::ProxyIDSeq_var proxys = admin->push_consumers (); CORBA::ULong plen = proxys->length (); - + if (plen > 0) { ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, @@ -1084,7 +1084,7 @@ TAO_MonitorEventChannel::get_suppliers ( else { ACE_CString name; - + if (this->consumer_map_.find (proxys[i], name) == 0) { count++; @@ -1095,7 +1095,7 @@ TAO_MonitorEventChannel::get_suppliers ( } } } - + return count; } @@ -1110,7 +1110,7 @@ TAO_MonitorEventChannel::get_consumeradmins ( CosNotifyChannelAdmin::AdminIDSeq_var admin_ids = this->get_all_consumeradmins (); - + return this->get_admins (this->consumeradmin_map_, admin_ids.in (), names); @@ -1127,7 +1127,7 @@ TAO_MonitorEventChannel::get_supplieradmins ( CosNotifyChannelAdmin::AdminIDSeq_var admin_ids = this->get_all_supplieradmins (); - + return this->get_admins (this->supplieradmin_map_, admin_ids.in (), names); @@ -1141,7 +1141,7 @@ TAO_MonitorEventChannel::get_admins ( { size_t count = 0; CORBA::ULong length = admin_ids.length (); - + for (CORBA::ULong j = 0; j < length; ++j) { if (names == 0) @@ -1154,7 +1154,7 @@ TAO_MonitorEventChannel::get_admins ( else { ACE_CString name; - + if (map.find (admin_ids[j], name) == 0) { count++; @@ -1162,7 +1162,7 @@ TAO_MonitorEventChannel::get_admins ( } } } - + return count; } @@ -1172,14 +1172,14 @@ TAO_MonitorEventChannel::get_threadpool_task ( { CosNotifyChannelAdmin::ConsumerAdmin_var admin = this->get_consumeradmin (id); - + if (!CORBA::is_nil (admin.in ())) { // WARNING: Internal knowledge of TAO and the Notification // Service implementation. TAO_Notify_ConsumerAdmin* low_admin = dynamic_cast<TAO_Notify_ConsumerAdmin*> (admin->_servant ()); - + if (low_admin != 0) { return @@ -1198,16 +1198,16 @@ TAO_MonitorEventChannel::calculate_queue_size (bool count) CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); CORBA::ULong length = conadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; j++) { TAO_Notify_ThreadPool_Task* task = this->get_threadpool_task (conadmin_ids[j]); - + if (task != 0) { TAO_Notify_Message_Queue* queue = task->msg_queue (); - + if (count) { size += queue->message_count (); @@ -1237,17 +1237,17 @@ TAO_MonitorEventChannel::determine_slowest_consumer ( CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); CORBA::ULong length = conadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { TAO_Notify_ThreadPool_Task* task = this->get_threadpool_task (conadmin_ids[j]); - + if (task != 0) { TAO_Notify_Message_Queue* queue = task->msg_queue (); size_t count = queue->message_count (); - + if (count > largest) { largest = count; @@ -1260,23 +1260,23 @@ TAO_MonitorEventChannel::determine_slowest_consumer ( { CosNotifyChannelAdmin::ConsumerAdmin_var admin = this->get_consumeradmin (id); - + if (!CORBA::is_nil (admin.in ())) { CosNotifyChannelAdmin::ProxyIDSeq_var proxys = admin->push_suppliers (); CORBA::ULong plen = proxys->length (); - + if (plen > 0) { ACE_READ_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->supplier_mutex_); - + for (CORBA::ULong i = 0; i < plen; ++i) { ACE_CString name; - + if (this->supplier_map_.find (proxys[i], name) == 0) { names->push_back (name); @@ -1303,17 +1303,17 @@ TAO_MonitorEventChannel::get_oldest_event (void) // Loop through each consumer admins thread pool task and have the // buffering strategy give us the time of the oldest event. ACE_Time_Value tv (ACE_Time_Value::max_time); - + for (CORBA::ULong j = 0; j < length; ++j) { TAO_Notify_ThreadPool_Task* task = this->get_threadpool_task (conadmin_ids[j]); - + if (task != 0) { ACE_Time_Value old = task->buffering_strategy ()->oldest_event (); - + if (old < tv) { tv = old; @@ -1339,17 +1339,17 @@ TAO_MonitorEventChannel::is_duplicate_name ( { Map::const_iterator itr (map); Map::value_type* entry = 0; - + while (itr.next (entry)) { if (name == entry->item ()) { return true; } - + itr.advance (); } - + return false; } @@ -1359,7 +1359,7 @@ TAO_MonitorEventChannel::remove_list_name ( const ACE_CString& name) { size_t size = list.size (); - + for (size_t i = 0; i < size; ++i) { if (list[i] == name) @@ -1374,10 +1374,10 @@ TAO_MonitorEventChannel::remove_list_name ( { list[i] = list[size - 1]; } - + list.resize (size - 1, ""); } - + break; } } @@ -1392,19 +1392,19 @@ TAO_MonitorEventChannel::destroy_consumer ( CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = this->get_all_consumeradmins (); CORBA::ULong length = conadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::ConsumerAdmin_var admin = this->get_consumeradmin (conadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { try { CosNotifyChannelAdmin::ProxySupplier_var supplier = admin->get_proxy_supplier(id); - + if (!CORBA::is_nil(supplier.in())) { // WARNING: Internal knowledge of TAO and the @@ -1435,19 +1435,19 @@ TAO_MonitorEventChannel::destroy_supplier ( CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids = this->get_all_supplieradmins (); CORBA::ULong length = supadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::SupplierAdmin_var admin = this->get_supplieradmin (supadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { try { CosNotifyChannelAdmin::ProxyConsumer_var consumer = admin->get_proxy_consumer(id); - + if (!CORBA::is_nil(consumer.in())) { // WARNING: Internal knowledge of TAO and the diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp index b4d9df059ea..3cbd5a684a6 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorEventChannelFactory.cpp @@ -31,7 +31,7 @@ public: active_ (active) { } - + virtual void update (void) { if (this->type () == Monitor_Control_Types::MC_LIST) @@ -63,17 +63,17 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( ACE_CString dir_name (this->name_ + "/"); ACE_CString stat_name (dir_name + NotifyMonitoringExt::ActiveEventChannelCount); - + EventChannels* event_channels = 0; ACE_NEW (event_channels, EventChannels (this, stat_name, Monitor_Control_Types::MC_NUMBER, true)); - - event_channels->add_to_registry (); + + event_channels->add_to_registry (); event_channels->remove_ref (); - + this->stat_names_.push_back (stat_name); stat_name = dir_name + NotifyMonitoringExt::InactiveEventChannelCount; @@ -83,12 +83,12 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( stat_name, Monitor_Control_Types::MC_NUMBER, false)); - - event_channels->add_to_registry (); + + event_channels->add_to_registry (); event_channels->remove_ref (); - + this->stat_names_.push_back (stat_name); - + stat_name = dir_name + NotifyMonitoringExt::ActiveEventChannelNames; event_channels = 0; ACE_NEW (event_channels, @@ -96,10 +96,10 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( stat_name, Monitor_Control_Types::MC_LIST, true)); - + event_channels->add_to_registry (); event_channels->remove_ref (); - + this->stat_names_.push_back (stat_name); stat_name = dir_name + NotifyMonitoringExt::InactiveEventChannelNames; @@ -109,33 +109,33 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( stat_name, Monitor_Control_Types::MC_LIST, false)); - + event_channels->add_to_registry (); event_channels->remove_ref (); - + this->stat_names_.push_back (stat_name); stat_name = dir_name + NotifyMonitoringExt::EventChannelCreationTime; Monitor_Base* timestamp = 0; ACE_NEW (timestamp, Timestamp_Monitor (stat_name.c_str ())); - + ACE_Time_Value tv (ACE_OS::gettimeofday()); timestamp->receive (tv.sec () + (tv.usec () / 1000000.0)); - + timestamp->add_to_registry (); timestamp->remove_ref (); - + this->stat_names_.push_back (stat_name); - + Monitor_Point_Registry* instance = Monitor_Point_Registry::instance (); ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_); - + Monitor_Base* names = instance->get (NotifyMonitoringExt::EventChannelFactoryNames); - + if (names == 0) { stat_name = NotifyMonitoringExt::EventChannelFactoryNames; @@ -145,7 +145,7 @@ TAO_MonitorEventChannelFactory::TAO_MonitorEventChannelFactory ( CORBA::NO_MEMORY ()); names->add_to_registry (); } - + Monitor_Control_Types::NameList list = names->get_list (); list.push_back (this->name_); names->receive (list); @@ -157,7 +157,7 @@ TAO_MonitorEventChannelFactory::~TAO_MonitorEventChannelFactory (void) { Monitor_Point_Registry* instance = Monitor_Point_Registry::instance (); size_t size = this->stat_names_.size (); - + for (size_t i = 0; i < size; ++i) { instance->remove (this->stat_names_[i].c_str ()); @@ -235,7 +235,7 @@ TAO_MonitorEventChannelFactory::create_channel ( // Make sure we can get down to the real event channel TAO_MonitorEventChannel* mec = dynamic_cast<TAO_MonitorEventChannel*> (ec->_servant ()); - + if (mec == 0) { throw CORBA::INTERNAL (); @@ -270,13 +270,13 @@ TAO_MonitorEventChannelFactory::remove (TAO_Notify_EventChannel* channel) { TAO_MonitorEventChannel* mec = dynamic_cast<TAO_MonitorEventChannel*> (channel); - + if (mec != 0) { ACE_WRITE_GUARD (TAO_SYNCH_RW_MUTEX, guard, this->mutex_); this->map_.unbind (mec->name ()); } - + this->TAO_Notify_EventChannelFactory::remove (channel); } @@ -287,18 +287,18 @@ TAO_MonitorEventChannelFactory::get_suppliers ( size_t count = 0; CosNotifyChannelAdmin::EventChannel_var ec = this->get_event_channel (id); - + if (!CORBA::is_nil (ec.in ())) { CosNotifyChannelAdmin::AdminIDSeq_var supadmin_ids = ec->get_all_supplieradmins (); CORBA::ULong length = supadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::SupplierAdmin_var admin = ec->get_supplieradmin (supadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { CosNotifyChannelAdmin::ProxyIDSeq_var proxys = @@ -307,7 +307,7 @@ TAO_MonitorEventChannelFactory::get_suppliers ( } } } - + return count; } @@ -318,18 +318,18 @@ TAO_MonitorEventChannelFactory::get_consumers ( size_t count = 0; CosNotifyChannelAdmin::EventChannel_var ec = this->get_event_channel (id); - + if (!CORBA::is_nil (ec.in ())) { CosNotifyChannelAdmin::AdminIDSeq_var conadmin_ids = ec->get_all_consumeradmins (); CORBA::ULong length = conadmin_ids->length (); - + for (CORBA::ULong j = 0; j < length; ++j) { CosNotifyChannelAdmin::ConsumerAdmin_var admin = ec->get_consumeradmin (conadmin_ids[j]); - + if (!CORBA::is_nil (admin.in ())) { CosNotifyChannelAdmin::ProxyIDSeq_var proxys = @@ -338,7 +338,7 @@ TAO_MonitorEventChannelFactory::get_consumers ( } } } - + return count; } @@ -351,7 +351,7 @@ TAO_MonitorEventChannelFactory::get_ecs ( CosNotifyChannelAdmin::ChannelIDSeq_var ids = this->get_all_channels (); CORBA::ULong total = ids->length (); - + for (CORBA::ULong i = 0; i < total; ++i) { CosNotifyChannelAdmin::ChannelID id = ids[i]; @@ -359,7 +359,7 @@ TAO_MonitorEventChannelFactory::get_ecs ( // Check for connected consumers. size_t consumers = this->get_consumers (id); - + if (consumers > 0) { want_event_channel = active; @@ -370,7 +370,7 @@ TAO_MonitorEventChannelFactory::get_ecs ( { // Check for connected suppliers size_t suppliers = this->get_suppliers (id); - + if (suppliers > 0) { want_event_channel = active; @@ -380,24 +380,24 @@ TAO_MonitorEventChannelFactory::get_ecs ( if (want_event_channel) { count++; - + if (names != 0) { ACE_READ_GUARD_RETURN (TAO_SYNCH_RW_MUTEX, guard, this->mutex_, 0); - + Map::iterator itr (this->map_); Map::value_type* entry = 0; - + while (itr.next (entry)) { if (id == entry->item ()) { names->push_back (entry->key ()); } - + itr.advance (); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index 2cda51d0939..46d195bce4e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -462,7 +462,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( ACE_NEW_RETURN (any_ptr, CORBA::Any, -1); - + (*any_ptr) <<= name.c_str (); this->current_value_ = any_ptr; @@ -473,7 +473,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc ( ACE_NEW_RETURN (any_ptr, CORBA::Any (any), -1); - + this->current_value_ = any_ptr; return comp->accept (this); } @@ -686,7 +686,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( TAO_ETCL_Literal_Constraint id; this->queue_.dequeue_head (id); - + any_ptr->replace (id); any_ptr->impl ()->_add_ref (); this->current_value_ = any_ptr; @@ -785,7 +785,7 @@ TAO_Notify_Constraint_Visitor::visit_default (ETCL_Default *def) TAO_ETCL_Literal_Constraint disc_value; this->queue_.dequeue_head (disc_value); TAO_ETCL_Literal_Constraint default_index_value (default_index); - + return (disc_value == default_index_value); } catch (const CORBA::Exception&) @@ -817,10 +817,10 @@ TAO_Notify_Constraint_Visitor::visit_exist (ETCL_Exist *exist) { // If the implicit id is empty, then we must default // it to the filterable data and set up the value pointer. - + ETCL_Identifier* ident = dynamic_cast<ETCL_Identifier*> (component); - + if (ident != 0) { this->implicit_id_ = FILTERABLE_DATA; @@ -1142,7 +1142,7 @@ TAO_Notify_Constraint_Visitor::visit_in (ETCL_Binary_Expr *binary) ACE_NEW_RETURN (any_ptr, CORBA::Any, -1); - + CORBA::Any_var component = any_ptr; component->replace (bag); component->impl ()->_add_ref (); @@ -1451,7 +1451,7 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type, default: return false; } - + return true; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp index ae0109b6443..12c6dfaa571 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp @@ -158,9 +158,9 @@ TAO_Notify_POA_Helper::activate (PortableServer::Servant servant, CORBA::Long& i if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") - ACE_TEXT ("id = %d in POA : %C\n"), + ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in () )); } @@ -179,9 +179,9 @@ TAO_Notify_POA_Helper::activate_with_id (PortableServer::Servant servant, CORBA: if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Activating object with ") - ACE_TEXT ("existing id = %d in POA : %C\n"), + ACE_TEXT ("existing id = %d in POA : %C\n"), id, the_name.in () )); } @@ -204,9 +204,9 @@ TAO_Notify_POA_Helper::deactivate (CORBA::Long id) const if (DEBUG_LEVEL > 0) { CORBA::String_var the_name = this->poa_->the_name (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) POA_Helper Deactivating object with") - ACE_TEXT ("id = %d in POA : %C\n"), + ACE_TEXT ("id = %d in POA : %C\n"), id, the_name.in ())); } poa_->deactivate_object (oid.in ()); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp index 97c5bd1bcaf..5b3b6da7382 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp @@ -186,14 +186,14 @@ TAO_Notify_ProxyConsumer::destroy (void) } -ACE_Time_Value +ACE_Time_Value TAO_Notify_ProxyConsumer::last_ping() const { return this->last_ping_.value (); } -void +void TAO_Notify_ProxyConsumer::last_ping(const ACE_Time_Value& tv) { this->last_ping_ = tv; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp index b72836d6491..c80e3402a6f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp @@ -76,7 +76,7 @@ TAO_Notify_Refcountable::~TAO_Notify_Refcountable () { ACE_DEBUG ((LM_DEBUG,"object:%x %s(%d) with refcount:%d destroyed incorrectly.\n", e.obj, e.class_name, e.obj->ref_id_, e.obj->refcount_.value() )); - + if ( e.obj != this || e.obj->ref_id_ != this->ref_id_ ) { ACE_DEBUG ((LM_DEBUG, " with an ID mismatch %x->%d != %x->%d!\n", @@ -156,7 +156,7 @@ TAO_Notify_Tracker::dump( const char* title ) ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); ACE_DEBUG ((LM_DEBUG,"\nTAO_Notify_Tracker: %s\n", (title ? title : "dump"))); - + EntityMap::const_iterator iter( map_.begin() ); while ( iter != map_.end() ) { @@ -190,7 +190,7 @@ TAO_Notify_Tracker::add( TAO_Notify_Refcountable* p ) ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); int id = ++id_counter_; - + Entry e = { p, typeid(*p).name() }; std::pair< EntityMap::iterator, bool > result = map_.insert( std::make_pair( id, e ) ); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp index d669f2dde34..baba1386099 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp @@ -580,7 +580,7 @@ Routing_Slip_Persistence_Manager::build_chain( mblk = mblk->cont(); remainder = this->fill_block(*first_block, pos, mblk, 0); } - first_header.data_size = + first_header.data_size = static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder); first_header.next_overflow = 0; @@ -598,7 +598,7 @@ Routing_Slip_Persistence_Manager::build_chain( prevhdr->next_overflow = ACE_Utils::truncate_cast<Block_Number> (curblk->block_number()); prevhdr->put_header(*prevblk); pos = hdr->put_header(*curblk); - hdr->data_size = + hdr->data_size = static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); size_t offset_into_msg = mblk->length() - remainder; @@ -610,7 +610,7 @@ Routing_Slip_Persistence_Manager::build_chain( remainder = this->fill_block(*curblk, pos, mblk, 0); } - hdr->data_size = hdr->data_size - + hdr->data_size = hdr->data_size - static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder); if (prevblk != first_block) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp index 5fe8e2d658e..953bbbef2ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp @@ -89,7 +89,7 @@ TAO_Notify_SequenceProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushConsumer::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp index 77e38d43fab..20eea7db03d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp @@ -66,7 +66,7 @@ TAO_Notify_SequenceProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_SequenceProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp index ccf80e83b40..f4ef5cee6fb 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp @@ -85,7 +85,7 @@ TAO_Notify_StructuredProxyPushConsumer::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushConsumer::validate(%d)") ACE_TEXT("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp index facc962438d..47c93c2d2a4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp @@ -69,7 +69,7 @@ TAO_Notify_StructuredProxyPushSupplier::validate () { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) TAO_Notify_StructuredProxyPushSupplier::validate(%d)") ACE_TEXT ("disconnecting \n"), this->id ())); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp index 9d99446865f..4078536d4ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp @@ -90,8 +90,8 @@ TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event) if ( !connection_valid ) { try { - CORBA::PolicyList_var inconsistent_policies; - this->push_consumer_->_validate_connection (inconsistent_policies.out()); + CORBA::PolicyList_var inconsistent_policies; + this->push_consumer_->_validate_connection (inconsistent_policies.out()); } catch (const CORBA::COMM_FAILURE&) { @@ -123,8 +123,8 @@ TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& if ( !connection_valid ) { try { - CORBA::PolicyList_var inconsistent_policies; - this->push_consumer_->_validate_connection (inconsistent_policies.out()); + CORBA::PolicyList_var inconsistent_policies; + this->push_consumer_->_validate_connection (inconsistent_policies.out()); } catch (const CORBA::COMM_FAILURE&) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp index 5a2afe15d1b..f2e9ec6c8ad 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp @@ -55,8 +55,8 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier) { // The supplier may not connected or the supplier did // not provide a callback. In this case, the liveliness - // check should return true so it will be validated in - // next period. + // check should return true so it will be validated in + // next period. if (allow_nil_supplier) return true; else @@ -96,12 +96,12 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier) for (CORBA::ULong i = 0; i < policy_list.length (); i++) policy_list[i]->destroy (); - do_liveliness_check - = (last_ping == ACE_Time_Value::zero ? true + do_liveliness_check + = (last_ping == ACE_Time_Value::zero ? true : now - last_ping >= TAO_Notify_PROPERTIES::instance()->validate_client_delay ()); } else - do_liveliness_check = + do_liveliness_check = now - last_ping >= TAO_Notify_PROPERTIES::instance()->validate_client_interval (); if (CORBA::is_nil (rtt_obj_.in ())) @@ -121,7 +121,7 @@ TAO_Notify_Supplier::is_alive (bool allow_nil_supplier) catch (CORBA::Exception& ex) { if (DEBUG_LEVEL > 0) - { + { ex._tao_print_exception ("TAO_Notify_Supplier::is_alive: false"); } } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp index a9576fb69de..b1090cd9b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp @@ -28,7 +28,7 @@ namespace TAO_Notify { if (TAO_debug_level > 0) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("(%P|%t)Validate_Worker<TOPOOBJ>::work: obj is nil\n"))); } } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl index 5da9ea78453..e7ca24867fe 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup_Simple_DS.idl @@ -29,7 +29,7 @@ module PortableGroup typedef unsigned long long ObjectGroupId; typedef unsigned long ObjectGroupRefVersion; - struct TagGroupTaggedComponent + struct TagGroupTaggedComponent { // tag = TAG_GROUP; GIOP::Version component_version; GroupDomainId group_domain_id; diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.idl b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.idl index ed434537190..691a8e2199f 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.idl @@ -50,7 +50,7 @@ module RTEventLogAdmin DsLogAdmin::InvalidThreshold); }; - + }; #endif /* RTEVENT_LOG_ADMIN_IDL */ diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl index 374ef6c195b..ddbbea4405a 100644 --- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl +++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl @@ -15,7 +15,7 @@ module RtecScheduler typedef long Period_t; // 100 nanoseconds - typedef long Threads_t; + typedef long Threads_t; typedef sequence<Period_t> Period_Set; diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp index ea9dd850db2..9ca891642e7 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp @@ -358,7 +358,7 @@ ACE_DynScheduler::get_rt_info (Object_Name name, } } - + int ACE_DynScheduler::priority ( diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl index 2c01870582f..a93a0002f14 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // the factory is uninitialized, or in a config or runtime mode of // operation. -ACE_INLINE ACE_Scheduler_Factory::Factory_Status +ACE_INLINE ACE_Scheduler_Factory::Factory_Status ACE_Scheduler_Factory::status (void) { return status_; diff --git a/TAO/orbsvcs/orbsvcs/miop.idl b/TAO/orbsvcs/orbsvcs/miop.idl index 5cb773a2cd5..8aabf8bc7b3 100644 --- a/TAO/orbsvcs/orbsvcs/miop.idl +++ b/TAO/orbsvcs/orbsvcs/miop.idl @@ -43,7 +43,7 @@ module MIOP typedef GIOP::Version Version; typedef string Address; - + typedef sequence<IOP::TaggedComponent> Component_Seq; struct UIPMC_ProfileBody { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh index 4414a4ebf64..26156eb862c 100755 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/run_dispatching.sh @@ -12,7 +12,7 @@ IOR=test.ior for c in $LOW_PRIORITY; do # date # echo reactive $c -# +# # /bin/rm -f $IOR # ssh celegorm "cd /project/celegorm/coryan/EC_Roundtrip ; ./server -ORBSvcConf ec.dispatching_reactive.conf -o $IOR" >server.log 2>&1 </dev/null & # while [ ! -f $IOR ]; do @@ -20,10 +20,10 @@ for c in $LOW_PRIORITY; do # done # ./client -d -h 1000 -l 2000 -i 500 -n $c -k file://$IOR > ec_dispatching_reactive.$c.txt 2>&1 # wait -# +# # date # echo threaded $c -# +# # /bin/rm -f $IOR # ssh celegorm "cd /project/celegorm/coryan/EC_Roundtrip ; ./server -ORBSvcConf ec.dispatching_threaded.conf -o $IOR" >server.log 2>&1 </dev/null & # while [ ! -f $IOR ]; do diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl index 7b620447411..ea296d13ca8 100755 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl @@ -66,25 +66,25 @@ if ($sv1->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("sender", +$SV = $sv->CreateProcess ("sender", " -ORBInitRef NameService=file://$sv_nsiorfile ". "-s sender -r 10 ". "-f $sv_inputfile"); -$SV1 = $sv1->CreateProcess ("sender", +$SV1 = $sv1->CreateProcess ("sender", " -ORBInitRef NameService=file://$sv1_nsiorfile ". "-s sender -r 10 ". "-f $sv1_inputfile"); -$RE1 = $re1->CreateProcess ("receiver", +$RE1 = $re1->CreateProcess ("receiver", " -ORBInitRef NameService=file://$re1_nsiorfile ". "-s distributer -r receiver1 ". "-f $re1_outputfile1"); -$RE2 = $re2->CreateProcess ("receiver", +$RE2 = $re2->CreateProcess ("receiver", " -ORBInitRef NameService=file://$re2_nsiorfile ". "-s distributer -r receiver2 ". "-f $re2_outputfile2"); -$DI = $di->CreateProcess ("distributer", +$DI = $di->CreateProcess ("distributer", " -ORBInitRef NameService=file://$di_nsiorfile ". "-s sender -r distributer "); diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl index bd50addba68..084a848f01d 100755 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl @@ -48,13 +48,13 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("receiver", +$SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv_nsiorfile ". "-f $sv_outputfile"); -$CL = $cl->CreateProcess ("sender", +$CL = $cl->CreateProcess ("sender", " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile -r 2"); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl index 1a778d7edd4..c3b9ce0b5ea 100755 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl @@ -96,58 +96,58 @@ if ($sv3->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", "-ORBDottedDecimalAddresses 1 ". " -o $ns_nsiorfile"); -$SV1 = $sv1->CreateProcess ("sender", +$SV1 = $sv1->CreateProcess ("sender", " -ORBDebugLevel $debug_level ". "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $sv1_conffile ". "-ORBInitRef NameService=file://$sv1_nsiorfile ". "-s sender -r 30 ". "-f $sv1_inputfile"); -$SV2 = $sv2->CreateProcess ("sender", +$SV2 = $sv2->CreateProcess ("sender", " -ORBDebugLevel $debug_level ". "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $sv2_conffile ". "-ORBInitRef NameService=file://$sv2_nsiorfile ". "-s sender -r 30 ". "-f $sv2_inputfile"); -$SV3 = $sv3->CreateProcess ("sender", +$SV3 = $sv3->CreateProcess ("sender", " -ORBDebugLevel $debug_level ". "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $sv3_conffile ". "-ORBInitRef NameService=file://$sv3_nsiorfile ". "-s sender -r 30 ". "-f $sv3_inputfile"); -$RE1 = $re1->CreateProcess ("receiver", +$RE1 = $re1->CreateProcess ("receiver", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $re1_conffile ". "-ORBInitRef NameService=file://$re1_nsiorfile ". "-s distributer -r receiver1 ". "-f $re1_outputfile1"); -$RE2 = $re2->CreateProcess ("receiver", +$RE2 = $re2->CreateProcess ("receiver", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $re2_conffile ". "-ORBInitRef NameService=file://$re2_nsiorfile ". "-s distributer -r receiver2 ". "-f $re2_outputfile2"); -$DI1 = $di1->CreateProcess ("distributer", +$DI1 = $di1->CreateProcess ("distributer", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $di1_conffile ". "-ORBInitRef NameService=file://$di1_nsiorfile ". "-s sender -r distributer "); -$DI2 = $di2->CreateProcess ("distributer", +$DI2 = $di2->CreateProcess ("distributer", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $di2_conffile ". "-ORBInitRef NameService=file://$di2_nsiorfile ". "-s sender -r distributer "); -$DI3 = $di3->CreateProcess ("distributer", +$DI3 = $di3->CreateProcess ("distributer", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $di3_conffile ". "-ORBInitRef NameService=file://$di3_nsiorfile ". "-s sender -r distributer "); -$DI4 = $di4->CreateProcess ("distributer", +$DI4 = $di4->CreateProcess ("distributer", "-ORBDottedDecimalAddresses 1 ". " -ORBSvcConf $di4_conffile ". "-ORBInitRef NameService=file://$di4_nsiorfile ". diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl index 152b75c34c7..6a25b783a4c 100755 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl @@ -63,7 +63,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -106,16 +106,16 @@ for $protocol (@protocols) { else { $outputfile = $protocol."_output"; } - + my $sv_outputfile = $sv->LocalFile ($outputfile); $ns->DeleteFile ($outputfile); - $SV = $sv->CreateProcess ("server", + $SV = $sv->CreateProcess ("server", "-ORBInitRef NameService=file://$sv_nsiorfile ". "-ORBDebugLevel $debug ". "-f $sv_outputfile"); - $CL = $cl->CreateProcess ("ftp", + $CL = $cl->CreateProcess ("ftp", "-ORBInitRef NameService=file://$cl_nsiorfile ". "-ORBDebugLevel $debug ". "-f $cl_inputfile"); diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl index fc02f4b2fd8..b2158898318 100755 --- a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl @@ -34,11 +34,11 @@ $pong->DeleteFile ($pongiorfile); $ctrl->DeleteFile ($pingiorfile); $ctrl->DeleteFile ($pongiorfile); -$PING = $ping->CreateProcess ("ping", +$PING = $ping->CreateProcess ("ping", " -o $ping_pingiorfile"); -$PONG = $pong->CreateProcess ("pong", +$PONG = $pong->CreateProcess ("pong", " -o $pong_pongiorfile"); -$CTRL = $ctrl->CreateProcess ("control", +$CTRL = $ctrl->CreateProcess ("control", " -ORBDebugLevel $debug_level ". " -f file://$ctrl_pingiorfile ". " -g file://$ctrl_pongiorfile"); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl index 1fbf0f3461f..18b97cd8e9a 100755 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl @@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("receiver", +$SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv_nsiorfile ". "-f $sv_outputfile"); -$CL = $cl->CreateProcess ("sender", +$CL = $cl->CreateProcess ("sender", " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile"); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl index 94d4db635e8..86a97208a97 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl @@ -57,17 +57,17 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV1 = $sv1->CreateProcess ("server", +$SV1 = $sv1->CreateProcess ("server", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv1_nsiorfile ". "-f $sv1_test1file"); -$SV2 = $sv2->CreateProcess ("server", +$SV2 = $sv2->CreateProcess ("server", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv2_nsiorfile ". "-f $sv2_test2file"); -$CL = $cl->CreateProcess ("ftp", +$CL = $cl->CreateProcess ("ftp", "-ORBSvcConf $cl_conffile ". " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile"); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl index 0d9682f3dea..6081980fbb9 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl @@ -53,17 +53,17 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV1 = $sv1->CreateProcess ("server", +$SV1 = $sv1->CreateProcess ("server", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv1_nsiorfile ". "-f $sv1_test1file"); -$SV2 = $sv2->CreateProcess ("server", +$SV2 = $sv2->CreateProcess ("server", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv2_nsiorfile ". "-f $sv2_test2file"); -$CL = $cl->CreateProcess ("ftp", +$CL = $cl->CreateProcess ("ftp", " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile"); diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl index 2bb6b037ceb..322a99abd99 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl @@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("receiver", +$SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv_nsiorfile ". "-f $sv_outputfile"); -$CL = $cl->CreateProcess ("sender", +$CL = $cl->CreateProcess ("sender", " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile -r 2"); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl index 1591969296e..a3b1adff991 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -112,12 +112,12 @@ for $protocol (@protocols) { my $sv_outputfile = $sv->LocalFile ($outputfile); $ns->DeleteFile ($outputfile); - $SV = $sv->CreateProcess ("server", + $SV = $sv->CreateProcess ("server", "-ORBInitRef NameService=file://$sv_nsiorfile ". "-ORBDebugLevel $debug ". "-f $sv_outputfile"); - $CL = $cl->CreateProcess ("ftp", + $CL = $cl->CreateProcess ("ftp", "-ORBInitRef NameService=file://$cl_nsiorfile ". "-ORBDebugLevel $debug ". "-p $protocol ". diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl index 2f91b783982..5a0dd66571f 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl @@ -47,13 +47,13 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("receiver", +$SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv_nsiorfile ". "-f $sv_outputfile"); -$CL = $cl->CreateProcess ("sender", +$CL = $cl->CreateProcess ("sender", "-ORBDebugLevel 2 ". " -ORBInitRef NameService=file://$cl_nsiorfile ". "-f $cl_inputfile -r 2"); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl index 759584647d6..90377d6b61a 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl @@ -50,16 +50,16 @@ if ($sv->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$SV = $sv->CreateProcess ("sender", +$SV = $sv->CreateProcess ("sender", " -ORBDebugLevel $debug_level ". " -ORBInitRef NameService=file://$sv_nsiorfile ". "-f $sv_inputfile"); -$RE = $re->CreateProcess ("receiver", +$RE = $re->CreateProcess ("receiver", " -ORBInitRef NameService=file://$re_nsiorfile ". "-f $re_outputfile"); -$DI = $di->CreateProcess ("distributer", +$DI = $di->CreateProcess ("distributer", " -ORBInitRef NameService=file://$di_nsiorfile "); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl index 3d26e83d6a4..42285c2f5bc 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -111,12 +111,12 @@ for $protocol (@protocols) { my $sv_outputfile = $sv->LocalFile ($outputfile); $ns->DeleteFile ($outputfile); - $SV = $sv->CreateProcess ("receiver", + $SV = $sv->CreateProcess ("receiver", "-ORBInitRef NameService=file://$sv_nsiorfile ". "-ORBDebugLevel $debug ". "-f $sv_outputfile"); - $CL = $cl->CreateProcess ("sender", + $CL = $cl->CreateProcess ("sender", "-ORBInitRef NameService=file://$cl_nsiorfile ". "-ORBDebugLevel $debug ". "-p $protocol ". diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl index 3d26e83d6a4..42285c2f5bc 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; @@ -111,12 +111,12 @@ for $protocol (@protocols) { my $sv_outputfile = $sv->LocalFile ($outputfile); $ns->DeleteFile ($outputfile); - $SV = $sv->CreateProcess ("receiver", + $SV = $sv->CreateProcess ("receiver", "-ORBInitRef NameService=file://$sv_nsiorfile ". "-ORBDebugLevel $debug ". "-f $sv_outputfile"); - $CL = $cl->CreateProcess ("sender", + $CL = $cl->CreateProcess ("sender", "-ORBInitRef NameService=file://$cl_nsiorfile ". "-ORBDebugLevel $debug ". "-p $protocol ". diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl index b56a844d301..f41747f2233 100755 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl @@ -64,7 +64,7 @@ if ($CLI_status != 0) { print STDERR "ERROR: Closing Name Service returned $NS_status\n"; } $ns->DeleteFile ($nsiorfile); - exit 1; + exit 1; } # Now try it with a duff ior in the environment variable. @@ -80,7 +80,7 @@ if ($CLI_status != 1) { print STDERR "ERROR: Closing Name Service returned $NS_status\n"; } $ns->DeleteFile ($nsiorfile); - exit 1; + exit 1; } # Now try with a duff ior in the environment variable but overridden by @@ -97,7 +97,7 @@ if ($CLI_status != 0) { print STDERR "ERROR: Closing Name Service returned $NS_status\n"; } $ns->DeleteFile ($nsiorfile); - exit 1; + exit 1; } # Clean up and return diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl index a8832ba2f0a..45cffe108dd 100755 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl @@ -24,7 +24,7 @@ my $tao_idl_bin = "$ENV{ACE_ROOT}/bin"; my $service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $taoifr = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; - + # The idl file to be used for the test my $test_idl = "test.idl"; my $ifr_ior = "ifr.ior"; @@ -65,7 +65,7 @@ if ($result == 0) { last; } } - close (HANDLE); + close (HANDLE); } # Check result of idl compiler test @@ -90,7 +90,7 @@ if ($result != 0) { if ($service->WaitForFileTimed ($ifr_ior, $service->ProcessStartWaitInterval()) == -1) { print STDERR "ERROR: cannot find $service_ifr_ior\n"; $IFR_SERVICE->Kill (); $IFR_SERVICE->TimedWait (1); - $status = 1; + $status = 1; } if ($service->GetFile ($test_idl) == -1) { @@ -123,7 +123,7 @@ if ($client->PutFile ($ifr_ior) == -1) { exit 1; } -# Use the iao_ifr utility to add our test IDL +# Use the iao_ifr utility to add our test IDL $result = $TAO_IFR->SpawnWaitKill ($taoifr->ProcessStartWaitInterval() + 15); if ($result != 0) { @@ -131,7 +131,7 @@ if ($result != 0) { $status = 1; } -# Invoke the client code that retrieves the interface and checks it's not munged +# Invoke the client code that retrieves the interface and checks it's not munged $result = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 15); if ($result != 0) { diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl index a6ec278de0b..07b01ccf310 100755 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/run_test.pl @@ -56,7 +56,7 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_ $CL = $client->CreateProcess ("client", "-k file://$client_srv_ior"); $LC = $locator->CreateProcess ("$imr_bin_path/ImplRepo_Service", "-o $locator_imr_ior ". "-ORBEndpoint iiop://:$port"); -$AC = $activator->CreateProcess ("$imr_bin_path/ImR_Activator", +$AC = $activator->CreateProcess ("$imr_bin_path/ImR_Activator", "-o $activator_actv_ior ". "-ORBInitRef ImplRepoService=file://$activator_imr_ior"); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl index 00cc73c174e..1b66c41a709 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl @@ -16,18 +16,18 @@ module Test oneway void shutdown (); // Methods for first test - + // The client first calls this to generate a (user) exception // which is handled in the application code void throw_exception () raises (MyException); - + // Starts the nested sequence - client calls... boolean call_me_back (in Hello me); - + // ... then the server calls this back onto the client, // which prompts the client to call... boolean call_back (); - + // ... this ! The server interceptor will have been recording // if any retention ID has been reused in the sequence of invocations // @return true for all different, false otherwise. diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl index 8fd2f4fe3f6..b13c3915082 100755 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl @@ -83,7 +83,7 @@ for($i = 0; $i < $number_of_servers; $i++) { # Loops are cheap. for ($i = 0; $i < $number_of_servers; $i++) { $result = wait_get_send_ior($i); - + if ($result != 0) { for ($j = 0; $j < $i + 1; $j++) { $SV[$j]->Kill (); $SV[$j]->TimedWait (1); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl index b1492af15f9..018f2f5eac3 100755 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl @@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl index 36820e2b6d1..e79f3b87281 100644 --- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl +++ b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl @@ -1,7 +1,7 @@ // $Id$ #ifndef _TEST_IDL_ -#define _TEST_IDL_ +#define _TEST_IDL_ interface server { diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp index 54227cadba7..23e2e601a64 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp @@ -66,7 +66,7 @@ MessageLog::register_message_send (int message_num) { this->overdoseS_++; } - + if (!this->supress_) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl index ee23d89724a..10e7d173aa4 100755 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/run_test.pl @@ -33,7 +33,7 @@ my $client_iogrfile = $client->LocalFile ($iogrbase); $server->DeleteFile($iogrbase); $client->DeleteFile($iogrbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile " . "-p $server_iogrfile"); diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl index 7200081f22a..953172a670c 100755 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/run_test.pl @@ -32,7 +32,7 @@ $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); $client->DeleteFile($colloc_iorfile); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl index 595d9064fd1..5a906d21c11 100755 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test.pl @@ -11,7 +11,7 @@ use PerlACE::TestTarget; $status = 0; $debug_level = '0'; $miop_address = '230.255.255.33'; -$port = '7394'; +$port = '7394'; foreach $i (@ARGV) { if ($i eq '-debug') { @@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl index faceeae6586..7f548cc0884 100755 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/run_test_ipv6.pl @@ -11,7 +11,7 @@ use PerlACE::TestTarget; $status = 0; $debug_level = '0'; $miop_address = '[FF01:0:0:0:0:0:BEBE:75]'; -$port = '5555'; +$port = '5555'; foreach $i (@ARGV) { if ($i eq '-debug') { @@ -28,7 +28,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-u corbaloc:miop:1.0\@1.0-cdmwftdomain-1/$miop_address:$port " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl index 33d5a50cb28..9d5b15d0ea3 100755 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/run_test.pl @@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl index b1492af15f9..018f2f5eac3 100755 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/run_test.pl @@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp index 899ea6a9869..74f821455e5 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerConsumer.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/CosNotifyCommC.h" #include "orbsvcs/CosNamingC.h" @@ -38,7 +38,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } -int +int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { try @@ -50,53 +50,53 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService"); - + CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow(naming_obj.in()); - + CosNaming::Name name; name.length (1); name[0].id = CORBA::string_dup("MyEventChannel"); CORBA::Object_var ecObj = naming_context->resolve(name); - - CosNotifyChannelAdmin::EventChannel_var ec = + + CosNotifyChannelAdmin::EventChannel_var ec = CosNotifyChannelAdmin::EventChannel::_narrow(ecObj.in()); - + CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = CosNotifyChannelAdmin::OR_OP; - - CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->new_for_consumers(ifgop, + + CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin = + ec->new_for_consumers(ifgop, adminid); - + CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA"); - - PortableServer::POA_var poa = + + PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_object.in()); - + StructuredEventConsumer_i servant (orb); PortableServer::ObjectId_var objectId = poa->activate_object (&servant); - + CORBA::Object_var consumer_obj = poa->id_to_reference (objectId.in ()); - CosNotifyComm::StructuredPushConsumer_var consumer = + CosNotifyComm::StructuredPushConsumer_var consumer = CosNotifyComm::StructuredPushConsumer::_narrow (consumer_obj.in ()); - - CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; - + + CosNotifyChannelAdmin::ProxyID consumeradmin_proxy_id; + CosNotifyChannelAdmin::ProxySupplier_var proxy_supplier = consumer_admin->obtain_notification_push_supplier( CosNotifyChannelAdmin::STRUCTURED_EVENT, consumeradmin_proxy_id); - + supplier_proxy = CosNotifyChannelAdmin::StructuredProxyPushSupplier:: _narrow(proxy_supplier.in()); - + supplier_proxy->connect_structured_push_consumer(consumer.in()); - + @@ -117,14 +117,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) - PortableServer::POAManager_var poa_manager = poa->the_POAManager(); - + PortableServer::POAManager_var poa_manager = poa->the_POAManager(); + poa_manager->activate(); - + ACE_Time_Value run_time(12); orb->run(&run_time); - if ( servant.nummsgs() > 0 ) + if ( servant.nummsgs() > 0 ) { std::cout << "Success pass " << pass << ": events received " << std::endl; } @@ -132,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { std::cout << "ERROR pass " << pass << ": no events received " << std::endl; } - + } catch(const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index 8d6d23b5a00..ceb378aefae 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "orbsvcs/CosNotifyChannelAdminC.h" #include "orbsvcs/CosNotifyCommC.h" @@ -13,51 +13,51 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { - CORBA::Object_var naming_obj = + CORBA::Object_var naming_obj = orb_->resolve_initial_references ("NameService"); - + CosNaming::NamingContext_var naming_context = CosNaming::NamingContext::_narrow (naming_obj.in()); CosNaming::Name name; name.length (1); name[0].id = CORBA::string_dup ("NotifyEventChannelFactory"); - + CORBA::Object_var obj = naming_context->resolve (name); CosNotifyChannelAdmin::EventChannelFactory_var notify_factory = CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()); - + CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; CosNotification::AdminProperties initial_admin; - + CosNotifyChannelAdmin::EventChannel_var ec = notify_factory->create_channel (initial_qos, initial_admin, id); name[0].id = CORBA::string_dup ("MyEventChannel"); - + naming_context->rebind (name, ec.in()); - - CosNotifyChannelAdmin::AdminID adminid; - CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = - CosNotifyChannelAdmin::OR_OP; - + + CosNotifyChannelAdmin::AdminID adminid; + CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = + CosNotifyChannelAdmin::OR_OP; + CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin = ec->new_for_suppliers (ifgop, adminid); - + CosNotifyChannelAdmin::ProxyID supplieradmin_proxy_id; - + CosNotifyChannelAdmin::ProxyConsumer_var proxy_consumer = supplier_admin->obtain_notification_push_consumer( CosNotifyChannelAdmin::STRUCTURED_EVENT, supplieradmin_proxy_id); - - StructuredEventSupplier_i *servant = + + StructuredEventSupplier_i *servant = new StructuredEventSupplier_i(orb_.in()); - + CORBA::Object_var poa_obj = orb_->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow (poa_obj.in ()); PortableServer::POAManager_var mgr = poa->the_POAManager (); @@ -67,12 +67,12 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) CORBA::Object_var supplier_obj = poa->id_to_reference (objectId.in ()); - CosNotifyComm::StructuredPushSupplier_var supplier = + CosNotifyComm::StructuredPushSupplier_var supplier = CosNotifyComm::StructuredPushSupplier::_narrow (supplier_obj.in ()); - - consumer_proxy_ = + + consumer_proxy_ = CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxy_consumer.in()); - + consumer_proxy_-> connect_structured_push_supplier (supplier.in()); } @@ -87,29 +87,29 @@ CORBA::Boolean Messenger_i::send_message ( const char * subject, char *& message) { - + ACE_OS::printf("Message from: %s\nSubject: %s\nMessage: %s\n", user_name, subject, message); //cout << "Message from: " << user_name << endl; //cout << "Subject: " << subject << endl; //cout << "Message: " << message << endl; - - + + // Event Definition - CosNotification::StructuredEvent event; - - event.header.fixed_header.event_type.domain_name = + CosNotification::StructuredEvent event; + + event.header.fixed_header.event_type.domain_name = CORBA::string_dup("OCI_TAO"); // string - event.header.fixed_header.event_type.type_name = + event.header.fixed_header.event_type.type_name = CORBA::string_dup("examples"); // string - event.header.fixed_header.event_name = + event.header.fixed_header.event_name = CORBA::string_dup("myevent"); - + // OptionalHeaderFields - // PropertySeq - + // PropertySeq + // sequence<Property>: string name, any value event.filterable_data.length (3); event.filterable_data[0].name = CORBA::string_dup("Message from:"); @@ -118,7 +118,7 @@ CORBA::Boolean Messenger_i::send_message ( event.filterable_data[1].value <<= (const char *)subject; event.filterable_data[2].name = CORBA::string_dup("Message:"); event.filterable_data[2].value <<= (const char *)message; - + std::cout << "pushing " << std::endl; consumer_proxy_->push_structured_event(event); diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp index aabf120fa4f..df513d49278 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventConsumer_i.cpp @@ -11,7 +11,7 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) { } -void +void StructuredEventConsumer_i::push_structured_event( const CosNotification::StructuredEvent &event ) @@ -20,10 +20,10 @@ StructuredEventConsumer_i::push_structured_event( std::cout << "event received " << std::endl; const char *value; - + for (unsigned int i=0; i<event.filterable_data.length(); i++) { event.filterable_data[i].value >>= value; - std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; + std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } count_++; if ( count_ >= 3 ) @@ -33,7 +33,7 @@ StructuredEventConsumer_i::push_structured_event( } -void +void StructuredEventConsumer_i::disconnect_structured_push_consumer() { @@ -48,11 +48,11 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() void StructuredEventConsumer_i::offer_change( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} int StructuredEventConsumer_i::nummsgs() diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp index d31ac1ec23d..24a2c4424a3 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "StructuredEventSupplier_i.h" #include "tao/PortableServer/PS_CurrentC.h" @@ -12,7 +12,7 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () { CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); - PortableServer::Current_var current = + PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); @@ -22,9 +22,9 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () void StructuredEventSupplier_i::subscription_change ( - const CosNotification::EventTypeSeq &, + const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq & ) { -} +} diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl index b471add6bec..32ec9db32c9 100644 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/Test.idl @@ -1,7 +1,7 @@ // $Id$ #ifndef _TEST_IDL_ -#define _TEST_IDL_ +#define _TEST_IDL_ module Test { diff --git a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl index db6949d6f35..51ce276ec70 100755 --- a/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_3444_Regression/run_test.pl @@ -40,7 +40,7 @@ sub run_test { $test->DeleteFile($iorbase); $test->DeleteFile($log); - + my($svc_conf); if ($test_conf ne ''){ $tmp_test_conf = $test->LocalFile ($test_conf); diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl index e78f65f3ce7..5d48a0a3b29 100755 --- a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl @@ -104,7 +104,7 @@ if ($server2->WaitForFileTimed ($ior2file, exit 1; } -sleep(10); +sleep(10); $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index 9c58bdefefc..d59c2fdb221 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -31,9 +31,9 @@ my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); my $es_nsiorfile = $es->LocalFile ($nsiorfile); my $con_nsiorfile = $con->LocalFile ($nsiorfile); my $sup_nsiorfile = $sup->LocalFile ($nsiorfile); -my $test_ecconffile = $test->LocalFile ($ecconffile); -my $es_ecconffile = $es->LocalFile ($ecconffile); -my $test_ecmtconffile = $test->LocalFile ($ecmtconffile); +my $test_ecconffile = $test->LocalFile ($ecconffile); +my $es_ecconffile = $es->LocalFile ($ecconffile); +my $test_ecmtconffile = $test->LocalFile ($ecmtconffile); $ns->DeleteFile ($nsiorfile); $es->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); @@ -41,7 +41,7 @@ $sup->DeleteFile ($nsiorfile); print STDERR "================ Collocated tests, single threaded\n"; -$T = $test->CreateProcess ("ECT_Throughput", +$T = $test->CreateProcess ("ECT_Throughput", "-ORBSvcConf $test_ecconffile ". "-u 10000 -n 1 -t 0 -c 4"); @@ -53,7 +53,7 @@ if ($T_status != 0) { print STDERR "================ Collocated tests, multi threaded\n"; -$T = $test->CreateProcess ("ECT_Throughput", +$T = $test->CreateProcess ("ECT_Throughput", "-ORBSvcConf $test_ecmtconffile ". "-u 10000 -n 1 -t 0 -c 4"); diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl index 697f4ec9a3e..768e8372da1 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl @@ -31,7 +31,7 @@ my $es_nsiorfile = $es->LocalFile ($nsiorfile); my $con_nsiorfile = $con->LocalFile ($nsiorfile); my $sup_nsiorfile = $sup->LocalFile ($nsiorfile); my $sup2_nsiorfile = $sup2->LocalFile ($nsiorfile); -my $es_ecmtconffile = $es->LocalFile ($ecmtconffile); +my $es_ecmtconffile = $es->LocalFile ($ecmtconffile); $ns->DeleteFile ($nsiorfile); $es->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); @@ -57,7 +57,7 @@ $CON = $con->CreateProcess ("ECT_Consumer", $SUP = $sup->CreateProcess ("ECT_Supplier", "-ORBInitRef NameService=file://$sup_nsiorfile ". " -s 3 -u 10000 -n 1 -t 0 -b 8"); - + $SUP2 = $sup2->CreateProcess ("ECT_Supplier", "-ORBInitRef NameService=file://$sup2_nsiorfile ". " -s 1 -u 10 -n 1 -t 0"); diff --git a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl index 7ff0920f1b1..633e3d5fdc1 100755 --- a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl +++ b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl @@ -17,10 +17,10 @@ $conf_file = PerlACE::LocalFile ("exhaustive$PerlACE::svcconf_ext"); @dispatching_configs = ("-ECDispatching reactive", "-ECDispatching mt -ECDispatchingThreads 4"); -@collection_strategies = ("copy_on_read", - "copy_on_write", +@collection_strategies = ("copy_on_read", + "copy_on_write", "delayed"); -@collection_types = ("list", +@collection_types = ("list", "rb_tree"); @filtering_configs = ("-ECFiltering prefix -ECSupplierFilter per-supplier", "-ECFiltering prefix -ECSupplierFilter null"); @@ -30,7 +30,7 @@ foreach $d (@dispatching_configs) { foreach $c (@collection_strategies) { foreach $t (@collection_types) { my $collection = "mt:".$c.":".$t; - + my $config = 'static EC_Factory "' .$d ." -ECProxyPushConsumerCollection ".$collection diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl index fe9d79a0e18..7fa7648f7e7 100755 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/run_test.pl @@ -118,7 +118,7 @@ sub run_test print STDERR "ERROR: supplier returned $process_status\n"; $status = 1; kill_processes (); - return $status; + return $status; } # Shutdown. @@ -197,7 +197,7 @@ sub analyze_results { } close (TEST_OUTPUT); } - + my $all_received = 1; if ($a_events != 100 || $b_events != 100 || $c_events != 100) { $all_received = 0; @@ -206,7 +206,7 @@ sub analyze_results { ."\t$b_events B events, expected 100\n" ."\t$c_events C events, expected 100\n"; } - + if ($all_received && $status == 0) { print STDERR "SUCCESS\n"; return 0; diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index 10c7ff35b06..8708015e3d0 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -22,7 +22,7 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit) void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) { // Loop through the events, looking for shutdown events. - for (u_int i = 0; i < events.length (); ++i) + for (u_int i = 0; i < events.length (); ++i) { //ACE_OS::printf("."); // Extract event data from the any. @@ -37,14 +37,14 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) << " source: " << events[i].header.source; #if !defined (TAO_LACKS_EVENT_CHANNEL_ANY) - if (events[i].data.any_value >>= eventData) + if (events[i].data.any_value >>= eventData) { out << " text: " << eventData; } #else if (events[i].data.payload.length() > 0) { - out << " text: " << + out << " text: " << (const char *)events[i].data.payload.get_buffer(); } #endif /* !TAO_LACKS_EVENT_CHANNEL_ANY */ diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl index 86285dfb808..286196cc55f 100755 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/run_test.pl @@ -67,13 +67,13 @@ sub run_test { kill_processes (); return -1; } - + # Consumer EC. if (run_ec (1, $consumer_conffile[$index], $consumer_iorfile) != 0) { kill_processes (); return -1; } - + # Consumer. $ps[2] = $test->CreateProcess ("consumer", "-ORBLogFile $output_files[2] ". "-ORBInitRef Event_Service=file://$consumer_iorfile"); @@ -81,10 +81,10 @@ sub run_test { kill_processes (); return -1; } - + # Give consumer a chance to connect to its EC before firing off the supplier. sleep ($sleeptime); - + # Supplier. $ps[3] = $test->CreateProcess ("supplier", "-ORBLogFile $output_files[3] ". "-ORBInitRef Event_Service=file://$supplier_iorfile"); @@ -172,16 +172,16 @@ sub analyze_results { } close (TEST_OUTPUT); - + if ($events_received != 100) { print STDERR "ERROR: consumer received $events_received events, expected 100\n"; } - + if ($events_received == 100 && $status == 0) { print STDERR "SUCCESS\n"; return 0; } - + print STDERR "ERROR - check $output_files[$process_id] for full output.\n"; return -1; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl index eac3e3f580f..96cad33de96 100755 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/run_test.pl @@ -124,7 +124,7 @@ sub analyze_results { print STDERR "ERROR: Could not open $filename\n"; return -1; } - + my $status = 0; while (<TEST_OUTPUT>) { if (m/total of/) { @@ -143,7 +143,7 @@ sub analyze_results { } } close (TEST_OUTPUT); - + foreach $pid (keys %heartbeats) { my $ideal_heartbeats = $apps_number * 50; my $received_heartbeats = $heartbeats{$pid}; @@ -165,7 +165,7 @@ sub analyze_results { print STDERR "SUCCESS\n"; return 0; } - + print STDERR "ERROR - check $filename for full output.\n"; return -1; } diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test.idl b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test.idl index df28b53177a..a305f82959f 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test.idl +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test.idl @@ -18,7 +18,7 @@ // ============================================================================ -module A +module A { exception DidTheRightThing { long id; @@ -27,13 +27,13 @@ module A interface AMI_Test { - long foo (out long out_l, + long foo (out long out_l, in long in_l, in string in_str) raises (DidTheRightThing); - + attribute long yadda; - + oneway void shutdown (); }; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl index 0aa55173539..7b86d30207f 100755 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/run_test.pl @@ -37,14 +37,14 @@ $client->DeleteFile($iorbase); $hostname = $server->HostName(); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-ORBEndPoint htiop://$hostname: " . "-ORBSvcConf $server_conf " . "-i $iterations " . "-o $server_iorfile"); - + $CL = $client->CreateProcess ("client", "-ORBSvcConf $client_conf " . "-k file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl index bd46594a6f4..44e31968528 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast.idl +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast.idl @@ -2,7 +2,7 @@ module MCast { - + interface Server { // = TITLE @@ -11,9 +11,9 @@ module MCast // Prints out the status. boolean connect_server (); - // Return <true> if the server received the + // Return <true> if the server received the // request from the client. - + }; }; diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl index be6c0529a55..f4c2b343c1b 100755 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl @@ -42,9 +42,9 @@ $act->DeleteFile ($actiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service", +$IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service", "-o $imr_imriorfile"); -$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator", +$ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator", "-o $act_actiorfile ". "-ORBInitRef ImplRepoService=file://$act_imriorfile"); $TI = $ti->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_imr"); @@ -55,13 +55,13 @@ $SRV = $srv->CreateProcess ("server"); my $server_cmd = $SRV->Executable(); my $srv_server_cmd = $imr->LocalFile ($server_cmd); -$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". +$TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile ". "add test_server -c \"$srv_server_cmd ". "-ORBInitRef ImplRepoService=file://$imr_imriorfile ". "-ORBUseIMR 1 ". "-o $srv_srviorfile\""); - - + + # We want the tao_imr executable to be found exactly in the path # given, without being modified by the value of -ExeSubDir. # So, we tell its Process object to ignore the setting of -ExeSubDir. diff --git a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl index b101254bfe4..4528c671079 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl +++ b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl @@ -7,7 +7,7 @@ interface Nestea_Bookshelf // Add a number of cans to the bookshelf. void crush (in long cans); - // Crush some of those cans. + // Crush some of those cans. long bookshelf_size (); // How many cans are in the collection? diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp index 5ec4ae92f9b..e42e5b9f394 100755 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/serverA.cpp @@ -28,7 +28,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) argv [0]), -1); } - + return 0; } @@ -51,7 +51,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->the_POAManager (); CORBA::PolicyList policies (5); - policies.length (5); + policies.length (5); // Lifespan policy policies[0] = @@ -116,7 +116,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) rootPOA->destroy (1, 1); orb->destroy (); } - catch (const CORBA::Exception &ex) + catch (const CORBA::Exception &ex) { ex._tao_print_exception ("Exception caught by serverA:"); return 1; diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl index 1e373359210..b6fca6b5240 100755 --- a/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/scale/run_test.pl @@ -67,7 +67,7 @@ $imr->DeleteFile ($persistdat); sub scale_test { print "Running scale test with $servers_count servers and $obj_count objects.\n"; - + my $result = 0; my $start_time = time(); @@ -104,7 +104,7 @@ sub scale_test } if ($use_activator) { - + $ACT->Arguments ("-d 1 -o $act_actiorfile -ORBInitRef ImplRepoService=file://$act_imriorfile"); $ACT_status = $ACT->Spawn (); if ($ACT_status != 0) { @@ -135,7 +135,7 @@ sub scale_test } } } - + $TI->Arguments ("-ORBInitRef ImplRepoService=file://$ti_imriorfile list"); $result = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()); if ($TI_status != 0) { @@ -145,9 +145,9 @@ sub scale_test return 1; } } - + for(my $i = 0; $i < $servers_count; $i++ ) { - + my $startfile = $objprefix . "_$i.status"; my $srv_startfile = $srv->LocalFile ($startfile); $srv->DeleteFile ($objprefix . "_$i.status"); @@ -203,7 +203,7 @@ sub scale_test last; } } - + if ($status == 1) { last; } @@ -216,7 +216,7 @@ sub scale_test $status = 1; } } - + my $IMR_status = $IMR->TerminateWaitKill ($imr->ProcessStopWaitInterval()); if ($IMR_status != 0) { print STDERR "ERROR: IMR returned $IMR_status\n"; @@ -225,7 +225,7 @@ sub scale_test my $test_time = time() - $start_time; my $total_objs = $obj_count * $servers_count; - + print "\nFinished. The test took $test_time seconds for $total_objs imr-ified objects.\n"; return $status; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl index 19207b58862..8230f0955fb 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test.idl @@ -8,15 +8,15 @@ module C1 }; module M1 -{ +{ valuetype VT; // Forward declare }; module M1 -{ +{ valuetype VT : // Full definition ::C1::EB - { + { public long id; }; }; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl index c0bf60dfe90..6e5d83ab0fc 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/Test.idl @@ -27,7 +27,7 @@ module Test { } thisonly; }; - exception exceptionOne + exception exceptionOne { union ExceptionUnion switch (ErrorType) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp index 4fd7f422bbd..4c7e5147a03 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.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:1179 #include "TestImpl.h" diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl index 42b85861cf6..869893d2983 100755 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl @@ -56,16 +56,16 @@ my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed my $iorbase = "if_repo.ior"; my $testoutputfilename = "IFR_Inheritance_test.output"; -my $log1 = "server1.log"; +my $log1 = "server1.log"; my $log2 = "server2.log"; my $log3 = "client.log"; my $log1_test = $test->LocalFile ($log1); -my $log2_test = $test->LocalFile ($log2); +my $log2_test = $test->LocalFile ($log2); my $log3_test = $test->LocalFile ($log3); $test->DeleteFile ($log1); -$test->DeleteFile ($log2); +$test->DeleteFile ($log2); $test->DeleteFile ($log3); my $test_iorfile = $test->LocalFile ($iorbase); @@ -79,10 +79,10 @@ $SV2 = $test->CreateProcess ("$tao_ifr", " IFR_Inheritance_Test.idl " . "-ORBInitRef InterfaceRepository=file://$test_iorfile " . "-ORBLogFile $log2_test"); - + $CL = $test->CreateProcess ("IFR_Inheritance_Test", "-ORBInitRef InterfaceRepository=file://$test_iorfile " . - "-ORBLogFile $log3_test"); + "-ORBLogFile $log3_test"); $server_status = $SV1->Spawn (); @@ -162,7 +162,7 @@ if ($server_status != 0) { } $test->DeleteFile ($log1); -$test->DeleteFile ($log2); +$test->DeleteFile ($log2); $test->DeleteFile ($log3); $test->DeleteFile($iorbase); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl index 7eec6e81c13..2ede1277b90 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/Test.idl @@ -20,13 +20,13 @@ module Test * This method is used to simplify the test shutdown process */ oneway void shutdown (); - + struct RoughWeek { BadDay isitok; SeqBadDay bad; }; - + RoughWeek this_week (); }; }; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp index f26859c4528..b88aec910d0 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp @@ -12,7 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - TAO_IFR_Client_Adapter *ifr_client = + TAO_IFR_Client_Adapter *ifr_client = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( TAO_ORB_Core::ifr_client_adapter_name ()); @@ -32,11 +32,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) "get interface returned nil ref\n"), 1); } - + CORBA::ContainedSeq_var attributes = intDef->contents (CORBA::dk_Attribute, 1); CORBA::ULong n_ats = attributes->length (); - + CORBA::ULong index = 0UL; CORBA::String_var name = attributes[index]->name (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl index 3b495f39dfa..35105f557c1 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/run_test.pl @@ -24,28 +24,28 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file"; @tests = - ( { + ( { description => "Dead Member Detection", strategy => "RoundRobin", svr1_args => "$init_ref -n 1 -o $ior2file", svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file", svr3_args => "$init_ref -n 3 -k file://$ior2file", client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin", - }, { + }, { description => "Hang Member Detection", strategy => "RoundRobin", svr1_args => "$init_ref -n 1 -o $ior2file", svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file -l 2", svr3_args => "$init_ref -n 3 -k file://$ior2file", client_args => "-k file://$ior2file -j file://$ior3file -s RoundRobin -l", - }, { + }, { description => "Dead Member Detection", strategy => "Random", svr1_args => "$init_ref -n 1 -o $ior2file", svr2_args => "$init_ref -n 2 -k file://$ior2file -j $ior3file", svr3_args => "$init_ref -n 3 -k file://$ior2file", client_args => "-k file://$ior2file -j file://$ior3file -s Random", - }, { + }, { description => "Hang Member Detection", strategy => "Random", svr1_args => "$init_ref -n 1 -o $ior2file", @@ -75,21 +75,21 @@ for $test (@tests) { $server2->DeleteFile($ior3file); $status = 0; - #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log + #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager", - "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" + "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV1 = $server2->CreateProcess ("server", $test->{svr1_args}); $SV2 = $server3->CreateProcess ("server", $test->{svr2_args}); $SV3 = $server4->CreateProcess ("server", $test->{svr3_args}); $CL = $client->CreateProcess ("client", $test->{client_args}); - + print STDERR "\n\n======== $test->{description} with $test->{strategy} ================\n"; print STDERR "\n"; print STDERR "== Start Load Banlancer.\n"; print STDERR $LM->CommandLine () . "\n"; - + $LM->Spawn (); if ($server1->WaitForFileTimed ($ior1file, $server1->ProcessStartWaitInterval()) == -1) { @@ -97,13 +97,13 @@ for $test (@tests) { $LM->Kill (); $LM->TimedWait (1); exit 1; } - + if ($server1->GetFile ($ior1file) == -1) { print STDERR "ERROR: cannot retrieve file <$server1_ior1file>\n"; $LM->Kill (); $LM->TimedWait (1); exit 1; } - + if ($server2->PutFile ($ior2file) == -1) { print STDERR "ERROR: cannot set file <$server2_ior2file>\n"; $LM->Kill (); $LM->TimedWait (1); @@ -120,7 +120,7 @@ for $test (@tests) { $SV1->Kill (); $SV1->TimedWait (1); exit 1; } - + if ($server2->GetFile ($ior2file) == -1) { print STDERR "ERROR: cannot retrieve file <$server2_ior2file>\n"; $LM->Kill (); @@ -147,7 +147,7 @@ for $test (@tests) { $SV2->Kill (); $SV2->TimedWait (1); exit 1; } - + if ($server3->GetFile ($ior3file) == -1) { print STDERR "ERROR: cannot retrieve file <$server3_ior1file>\n"; $LM->Kill (); @@ -173,7 +173,7 @@ for $test (@tests) { $status = 1; } - $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval()); + $server = $SV3->WaitKill ($server2->ProcessStopWaitInterval()); if ($server != 0) { print STDERR "ERROR: server 3 returned $server\n"; @@ -203,7 +203,7 @@ for $test (@tests) { $server1->DeleteFile($ior1file); $server2->DeleteFile($ior2file); $server3->DeleteFile($ior3file); - + if ($status == 0) { print STDERR "$description test passed.\n"; } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl index 323d1de9d0e..b9f1f6ef6b6 100755 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/run_test.pl @@ -27,7 +27,7 @@ $lm_conf = $^O eq 'MSWin32' ? "windows$PerlACE::svcconf_ext" $init_ref = "-ORBInitRef LoadManager=file://$ior1file"; -@tests = ({ +@tests = ({ description => "Dead Member Detection", strategy => "RoundRobin", svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file", @@ -35,7 +35,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file"; svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file", svr3_args => "$init_ref -n 3 -o $ior5file", client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin", - },{ + },{ description => "Hang Member Detection", strategy => "RoundRobin", svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file", @@ -43,7 +43,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file"; svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file -l 2", svr3_args => "$init_ref -n 3 -o $ior5file", client_args => "-k file://$ior2file -j file://$ior6file -s RoundRobin -l", - },{ + },{ description => "Dead Member Detection", strategy => "Random", svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file", @@ -51,7 +51,7 @@ $init_ref = "-ORBInitRef LoadManager=file://$ior1file"; svr2_args => "$init_ref -n 2 -o $ior4file -j $ior6file", svr3_args => "$init_ref -n 3 -o $ior5file", client_args => "-k file://$ior2file -j file://$ior6file -s Random", - },{ + },{ description => "Hang Member Detection", strategy => "Random", svr_args => "$init_ref -o $ior2file -x file://$ior3file -y file://$ior4file -z file://$ior5file", @@ -88,9 +88,9 @@ for $test (@tests) { $server5->DeleteFile($ior5file); $status = 0; - #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log + #-ORBVerboseLogging 1 -ORBDebugLevel 10 -ORBLogFile lm.log $LM = $server1->CreateProcess ("../../../../LoadBalancer/LoadManager", - "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" + "-ORBVerboseLogging 1 -ORBDebugLevel $debug -s $test->{strategy} -o $ior1file -i 3" . " -ORBSvcConf $lm_conf"); $SV = $server2->CreateProcess ("server", $test->{svr_args}); $SV1 = $server3->CreateProcess ("factory_server", $test->{svr1_args}); diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl index 923dc36f9fc..cccac658d74 100755 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl @@ -20,7 +20,7 @@ foreach $i (@ARGV) { my $ns_service = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $lg_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; my $client = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n"; - + my $iorbase = "ns.ior"; my $ns_iorfile = $ns_service->LocalFile ($iorbase); my $lg_iorfile = $lg_service->LocalFile ($iorbase); @@ -79,7 +79,7 @@ if ($process_status != 0) { exit 1; } -# Give time for logging service to initialize and install its object +# Give time for logging service to initialize and install its object # reference in the nameing service. sleep (10); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp index ed839a353d0..571c229299c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp @@ -9,7 +9,7 @@ int runtime = 5; //sec namespace CosNotifyCommImpl{ - class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer + class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer { public: StructuredPushConsumer () : received_ (false) {}; @@ -20,24 +20,24 @@ namespace CosNotifyCommImpl{ { received_ = true; std::cout << "Received an event...," << std::endl; - std::cout << "event.header.fixed_header.event_type.domain_name = " - << event.header.fixed_header.event_type.domain_name + std::cout << "event.header.fixed_header.event_type.domain_name = " + << event.header.fixed_header.event_type.domain_name << std::endl; - std::cout << "event.header.fixed_header.event_type.type_name = " + std::cout << "event.header.fixed_header.event_type.type_name = " << event.header.fixed_header.event_type.type_name << std::endl; }; void disconnect_structured_push_consumer() - {}; + {}; void offer_change ( const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) {}; - bool received_events () + bool received_events () { return this->received_; }; @@ -61,8 +61,8 @@ int parse_args (int argc, ACE_TCHAR *argv[]) default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("usage: %s -t <runtime>\n"), - argv [0]), + ACE_TEXT ("usage: %s -t <runtime>\n"), + argv [0]), -1); } @@ -81,7 +81,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in()); poa_manager = root_poa->the_POAManager(); - + if (parse_args (argc, argv) != 0) return 1; @@ -92,7 +92,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in()); //Instanciating the Consumer - CosNotifyComm::StructuredPushConsumer_var spc = + CosNotifyComm::StructuredPushConsumer_var spc = CosNotifyComm::StructuredPushConsumer::_nil(); CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer; @@ -128,7 +128,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //Attaching a filter to pps - CosNotifyFilter::FilterFactory_var dff = + CosNotifyFilter::FilterFactory_var dff = ec->default_filter_factory(); ACE_ASSERT(!CORBA::is_nil(dff.in())); @@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraints[0].constraint_expr = CORBA::string_dup( ""); - filter->add_constraints(constraints); + filter->add_constraints(constraints); pps->add_filter(filter.in()); diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp index 538dcf9abe0..8c3ac52b03a 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp @@ -8,7 +8,7 @@ const char *ior = "file://ecf.ior"; -CosNotifyChannelAdmin::EventChannel_var +CosNotifyChannelAdmin::EventChannel_var get_event_channel(CORBA::ORB_ptr orb) { @@ -25,7 +25,7 @@ get_event_channel(CORBA::ORB_ptr orb) if (CORBA::is_nil(obj.in ())) { - std::cerr << "Bad ec_fact.ior " << std::endl; + std::cerr << "Bad ec_fact.ior " << std::endl; exit(1); } @@ -46,7 +46,7 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_all_channels: " + std::cerr << "System exception occurred during get_all_channels: " << se << std::endl; exit(1); } @@ -54,13 +54,13 @@ get_event_channel(CORBA::ORB_ptr orb) if( channelIdSeq->length() == 0 ) { - try + try { ec = factory->create_channel( init_qos, init_admin, id); } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during find_channel: " + std::cerr << "System exception occurred during find_channel: " << se << std::endl; exit(1); } @@ -72,14 +72,14 @@ get_event_channel(CORBA::ORB_ptr orb) } catch (CosNotifyChannelAdmin::ChannelNotFound&) { - std::cerr << "ChannelNotFound: " + std::cerr << "ChannelNotFound: " << channelIdSeq[0] << std::endl; exit(1); } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during get_event_channel: " + std::cerr << "System exception occurred during get_event_channel: " << se << std::endl; exit(1); } @@ -89,9 +89,9 @@ get_event_channel(CORBA::ORB_ptr orb) return ec._retn(); } - -void match_structure_test (const CosNotifyFilter::Filter_var& filter, - const CosNotification::StructuredEvent& event, + +void match_structure_test (const CosNotifyFilter::Filter_var& filter, + const CosNotification::StructuredEvent& event, bool & expected_result) { bool bResult = false; @@ -104,7 +104,7 @@ void match_structure_test (const CosNotifyFilter::Filter_var& filter, } catch (CORBA::SystemException& se ) { - std::cerr << "System exception occurred during match_structured: " + std::cerr << "System exception occurred during match_structured: " << se << std::endl; exit(1); } @@ -141,22 +141,22 @@ void update_constraints (const CosNotifyFilter::Filter_var& filter, constraints[0].event_types = event_types; constraints[0].constraint_expr = CORBA::string_dup(""); - CosNotifyFilter::ConstraintInfoSeq_var cons_info - = filter->add_constraints(constraints); + CosNotifyFilter::ConstraintInfoSeq_var cons_info + = filter->add_constraints(constraints); std::cout << "Constructing a filter..." << std::endl; for (CORBA::ULong i = 0; i < event_types.length(); ++i) { - std::cout << "\tevent_types[" << i << "].domain_name=" + std::cout << "\tevent_types[" << i << "].domain_name=" << event_types[i].domain_name << std::endl; - std::cout << "\tevent_types[" << i << "].type_name=" + std::cout << "\tevent_types[" << i << "].type_name=" << event_types[i].type_name << std::endl; } - std::cout << "\tIts constraint =" + std::cout << "\tIts constraint =" << constraints[0].constraint_expr.in () << std::endl; } @@ -182,7 +182,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in()); //Attaching a filter to pps - CosNotifyFilter::FilterFactory_var dff = + CosNotifyFilter::FilterFactory_var dff = ec->default_filter_factory(); ACE_ASSERT(!CORBA::is_nil(dff.in())); @@ -201,10 +201,10 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) event.remainder_of_body <<= ""; std::cout << "Constructing a test event" << std::endl; - std::cout << "\tIts header.fixed_header.event_type.domain_name=" + std::cout << "\tIts header.fixed_header.event_type.domain_name=" << event.header.fixed_header.event_type.domain_name << std::endl; - std::cout << "\tIts header.fixed_header.event_type.type_name=" + std::cout << "\tIts header.fixed_header.event_type.type_name=" << event.header.fixed_header.event_type.type_name << std::endl; diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl index b4fae61a0be..94a2ecff147 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl @@ -116,7 +116,7 @@ if ($persistent_test == 1) { exit 1; } - sleep(5); + sleep(5); } print "\n*********** Starting the notification Supplier ***********\n\n"; diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp index ea848c0f6f5..509fe6d4ea4 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp @@ -65,7 +65,7 @@ Consumer_Client::parse_args (int argc, ACE_TCHAR *argv[]) return 0; } -static CosNotifyFilter::Filter_ptr +static CosNotifyFilter::Filter_ptr create_proxyFilter (CosNotifyChannelAdmin::EventChannel_ptr ec) { CosNotifyFilter::FilterFactory_var ffact = @@ -100,7 +100,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, CORBA::NO_MEMORY ()); consumer_1->init (client->root_poa ()); - + consumer_1->_connect (admin, filter); } diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp index d033f457c44..ac070a66d2c 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp @@ -91,7 +91,7 @@ Supplier_Client::parse_args (int argc, ACE_TCHAR *argv[]) case 'o': ior_output_file = get_opts.optarg; break; - + case 'd': domain = get_opts.optarg; break; diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp index efd2bf5bffc..ad64a1153a1 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/Consumer.cpp @@ -33,12 +33,12 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) name.length (1); name[0].id = CORBA::string_dup ("Channel1"); CORBA::Object_var obj1 = naming->resolve (name); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel1\n"))); name[0].id = CORBA::string_dup ("Channel2"); CORBA::Object_var obj2 = naming->resolve (name); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Successfully retrieved Challel2\n"))); } } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp index d17740078c4..f885410207d 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -35,11 +35,11 @@ parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("h:p:o:")); int c; - + ACE_TCHAR *hostname = 0; ACE_TCHAR *port = 0; ACE_TCHAR *ior_file = 0; - + while ((c = get_opts ()) != -1) switch (c) { @@ -52,14 +52,14 @@ parse_args (int argc, ACE_TCHAR *argv[]) case 'o': ior_file = get_opts.opt_arg (); break; - + case '?': default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s " "-h <hostname> " "-p <port> " - "-o <ior> " + "-o <ior> " "\n", argv [0]),-1); } @@ -69,7 +69,7 @@ if ( hostname == 0 || port == 0 || ior_file == 0){ "usage: %s " "-h <hostname> " "-p <port> " - "-o <ior> " + "-o <ior> " "\n", argv [0]),-1); } @@ -84,7 +84,7 @@ ACE_OS::sprintf(scpc_loadOrb, str, hostname, port); return 0; } - + void loadunloadcycle() @@ -168,7 +168,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) LM_DEBUG, ACE_TEXT ("(%P|%t) main - entered\n") )); - + if (parse_args (argc, argv) != 0) return 1; diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp index fd08aa2024c..9ab2f4ee5c7 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/consumer.cpp @@ -9,7 +9,7 @@ int runtime = 5; //sec namespace CosNotifyCommImpl{ - class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer + class StructuredPushConsumer: public virtual POA_CosNotifyComm:: StructuredPushConsumer { public: StructuredPushConsumer () : received_ (false) {}; @@ -20,23 +20,23 @@ namespace CosNotifyCommImpl{ { received_ = true; std::cout << "Received an event...," << std::endl; - std::cout << "event.header.fixed_header.event_type.domain_name = " - << event.header.fixed_header.event_type.domain_name + std::cout << "event.header.fixed_header.event_type.domain_name = " + << event.header.fixed_header.event_type.domain_name << std::endl; - std::cout << "event.header.fixed_header.event_type.type_name = " + std::cout << "event.header.fixed_header.event_type.type_name = " << event.header.fixed_header.event_type.type_name << std::endl; }; void disconnect_structured_push_consumer() - {}; + {}; void offer_change ( const CosNotification::EventTypeSeq &, const CosNotification::EventTypeSeq &) {}; - bool received_events () + bool received_events () { return this->received_; }; @@ -60,8 +60,8 @@ int parse_args (int argc, ACE_TCHAR *argv[]) default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("usage: %s -t <runtime>\n"), - argv [0]), + ACE_TEXT ("usage: %s -t <runtime>\n"), + argv [0]), -1); } @@ -80,7 +80,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in()); poa_manager = root_poa->the_POAManager(); - + if (parse_args (argc, argv) != 0) return 1; @@ -91,7 +91,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CosNotifyChannelAdmin::EventChannel_var ec = get_event_channel(orb.in()); //Instanciating the Consumer - CosNotifyComm::StructuredPushConsumer_var spc = + CosNotifyComm::StructuredPushConsumer_var spc = CosNotifyComm::StructuredPushConsumer::_nil(); CosNotifyCommImpl::StructuredPushConsumer *pImpl_spc = new CosNotifyCommImpl::StructuredPushConsumer; @@ -127,7 +127,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) //Attaching a filter to pps - CosNotifyFilter::FilterFactory_var dff = + CosNotifyFilter::FilterFactory_var dff = ec->default_filter_factory(); ACE_ASSERT(!CORBA::is_nil(dff.in())); @@ -149,7 +149,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) constraints[0].constraint_expr = CORBA::string_dup( "$data == 1 or $data == 2 or $data == 4"); - filter->add_constraints(constraints); + filter->add_constraints(constraints); pps->add_filter(filter.in()); @@ -158,7 +158,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) std::cout << "The filter's event_types[0].type_name = " << event_types[0].type_name << std::endl; std::cout << "The filter's event_types[1].domain_name = " << event_types[1].domain_name << std::endl; std::cout << "The filter's event_types[1].type_name = " << event_types[1].type_name << std::endl; - std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl; + std::cout << "The filter's constraint_expr=" << constraints[0].constraint_expr << std::endl; //Connecting a Supplier to a Proxy Consumer try @@ -185,7 +185,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (pImpl_spc->received_events ()) { //Consumer should not receive any events as the user defined constraint takes - //effect. + //effect. std::cerr << "Test failed - should not receive test events." << std::endl; return 1; } diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 787ea85518c..96616baea25 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -315,7 +315,7 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc) consumerCountData->data_union.num (); if (consumerCountNum.last != 1) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should still be one Consumer\n")); - + ACE_CString queueElementName = this->base_ + NotifyMonitoringExt::EventChannelQueueElementCount; Monitor::Data_var queueElementData = nsm_->get_statistic(queueElementName.c_str ()); @@ -324,7 +324,7 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc) if (queueElementNum.last == 0) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: There should be at least one " "event queued\n")); - + ACE_CString adminNamesName = this->base_ + NotifyMonitoringExt::EventChannelConsumerAdminNames; Monitor::Data_var adminNamesData = nsm_->get_statistic(adminNamesName.c_str ()); @@ -348,9 +348,9 @@ MonitorTestInterface_i::finished (MonitorTestInterface::Which proc) ACE_ERROR ((LM_ERROR, "Monitor: ERROR: The most recent queue size [%f] should not be greater than 2000.\n", queueSizeNum.last)); } - + consumer_stats_check(); - + brain_dump ("Finished Supplier"); break; } diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl index d9f1a785e00..a23511063a8 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl @@ -93,9 +93,9 @@ if ($con->PutFile ($nsiorfile) == -1) { sub run_test { my $client_args = shift; - + $nfs->DeleteFile ($nfsiorfile); - + $NFS->Arguments ($NFS_Args); $args = $NFS->Arguments (); print STDERR "Running Notification with arguments: $args\n"; @@ -133,7 +133,7 @@ sub run_test $NFS->Kill (); $NFS->TimedWait (1); exit 1; } - + $CON_status = $CON->WaitKill ($con->ProcessStartWaitInterval()+$experiment_timeout); if ($CON_status != 0) { print STDERR "ERROR: Consumer returned $CON_status\n"; diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index 95f9b1ce05a..06e96624354 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -51,7 +51,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index 987280e3a79..6f11a7fcb5d 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -38,7 +38,7 @@ my $port = $nm_service->RandomPort(); my $host = $nm_service->HostName(); my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService "; - + $NS = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior"); $TS = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", $initref. @@ -71,7 +71,7 @@ sub run_test { $SP->Kill (); $SP->TimedWait (1); return 1; } - + if ($supplier->GetFile ($supplier_ior) == -1) { print STDERR "ERROR: cannot retrieve file <$supplier_supplier_ior>\n"; $SP->Kill (); $SP->TimedWait (1); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index c3429f9f78a..78e68f62431 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -58,10 +58,10 @@ my $nt_service = PerlACE::TestTarget::create_target (2) || die "Create target 2 my $nm_ior = "naming.ior"; my $nt_ior = "notify.ior"; -my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf); +my $nt_service_nt_conf = $nt_service->LocalFile($nt_conf); my $nm_service_nm_ior = $nm_service->LocalFile($nm_ior); my $nt_service_nm_ior = $nt_service->LocalFile($nm_ior); -my $nt_service_nt_ior = $nt_service->LocalFile($nt_ior); +my $nt_service_nt_ior = $nt_service->LocalFile($nt_ior); $nm_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nt_ior); diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl index d3e18164e16..4cba833ddf5 100755 --- a/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl +++ b/TAO/orbsvcs/tests/Security/BiDirectional/run_test.pl @@ -17,8 +17,8 @@ $conf_client = ""; $conf_server = ""; $iter = 10; -sub options () { - my $help = 0; # handled locally +sub options () { + my $help = 0; # handled locally my $man = 0; # handled locally my $ssl = 1; # handled locally my $dotdec = 0; # handled locally @@ -27,15 +27,15 @@ sub options () { my $chost; # handled locally # Process options. - if ( @ARGV > 0 ) { - GetOptions ('help|?' => \$help, - 'manual' => \$man, - 'iter=i' => \$iter, - 'ssl' => \$ssl, - 'dd=s' => \$dotdec, - 'shost=s' => \$shost, - 'chost=s' => \$chost, - 'debug=i' => \$debug) or pod2usage(2); + if ( @ARGV > 0 ) { + GetOptions ('help|?' => \$help, + 'manual' => \$man, + 'iter=i' => \$iter, + 'ssl' => \$ssl, + 'dd=s' => \$dotdec, + 'shost=s' => \$shost, + 'chost=s' => \$chost, + 'debug=i' => \$debug) or pod2usage(2); } if ($ssl) { @@ -66,18 +66,18 @@ sub options () { if ( $man or $help ) { # Load Pod::Usage only if needed. - require "Pod/Usage.pm"; - import Pod::Usage; + require "Pod/Usage.pm"; + import Pod::Usage; pod2usage(1) if $help; - pod2usage(VERBOSE => 2) if $man; + pod2usage(VERBOSE => 2) if $man; return 0; - } + } return 1; } # Make sure OpenSSL knows where to find the trust store -$ENV{'SSL_CERT_DIR'} = './ssl'; +$ENV{'SSL_CERT_DIR'} = './ssl'; options () or die "Error: Nothing executed"; @@ -92,13 +92,13 @@ $client->DeleteFile($iorbase); print STDERR "Executing: server $conf_server $opt -o $iorbase -i $iter\n"; -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "$conf_server " . "$opt " . "-o $server_iorfile " . "-i $iter"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "$conf_client " . "$opt " . "-k file://$client_iorfile"); @@ -157,7 +157,7 @@ run_test.pl - A driver to run the test =head1 SYNOPSIS B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>] - [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>] + [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>] [B<-debug level>] @@ -167,7 +167,7 @@ This is a test that exercises the birectional GIOP connection implementation in TAO over SSLIOP connection. Start the server like this $ server -ORBSvcConf server.conf -o <file.ior> -i <no_iterations> - $ client -ORBSvcConf client.conf -k file://<file.ior> -x + $ client -ORBSvcConf client.conf -k file://<file.ior> -x Or, simply @@ -188,13 +188,13 @@ added support for SSLIOP. [B<-help|?>] Print a short help message -[B<-iter iterations>] +[B<-iter iterations>] The number of iterations to make. Default is 10. -[B<-chost hostname>] +[B<-chost hostname>] The hostname_in_ior for the client. Used only if specified. -[B<-shost hostname>] +[B<-shost hostname>] The hostname_in_ior for the server. Used only if specified. [B<-man>] @@ -205,7 +205,7 @@ added support for SSLIOP. server or both. Values of who can be "client", "server" or "client,server". -[B<-ssl>] +[B<-ssl>] Enables the use of SSLIOP instead of IIOP. Default. [B<-debug level>] diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp index 299f4a79f7f..1d7af9b5648 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id:$ +// $Id$ #include "Foo_i.h" diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp index b610aff6f31..9ff9e8c0f81 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp @@ -1,6 +1,6 @@ // -*- C++ -*- // -// $Id:$ +// $Id$ // #include "ace/Get_Opt.h" @@ -26,10 +26,10 @@ null_cipher_test (CORBA::ORB_ptr orb, //trust <<= establish_trust; CORBA::PolicyList policy_list (2); - policy_list.length (1); + policy_list.length (1); policy_list[0] = orb->create_policy (Security::SecQOPPolicy, protection); -// policy_list[1] = +// policy_list[1] = // orb->create_policy (Security::SecEstablishTrustPolicy, trust); // Create an object reference that uses plain IIOP (i.e. no diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp index 06c32756aed..58952f10247 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerClient.cpp @@ -55,9 +55,9 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 1; } - CORBA::String_var message = CORBA::string_dup( + CORBA::String_var message = CORBA::string_dup( "Implementing security policy now!" ); - messenger->send_message( "Chief of Security", + messenger->send_message( "Chief of Security", "New Directive", message.inout() ); std::cout << "message was sent" << std::endl; diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp index b5e36458b92..7016f698fe8 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/MessengerServer.cpp @@ -56,14 +56,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Register the servant with the RootPOA, obtain its object // reference, stringify it, and write it to a file. - PortableServer::ObjectId_var oid = + PortableServer::ObjectId_var oid = poa->activate_object( &messenger_servant ); CORBA::Object_var messenger_obj = poa->id_to_reference( oid.in() ); CORBA::String_var str = orb->object_to_string( messenger_obj.in() ); std::ofstream iorFile( ACE_TEXT_ALWAYS_CHAR(ior_output_file) ); iorFile << str.in() << std::endl; iorFile.close(); - std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl; + std::cout << "IOR written to file " << ACE_TEXT_ALWAYS_CHAR(ior_output_file) << std::endl; // Accept requests orb->run(); diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index e2530f2bc2f..b1f3d5b0f84 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -119,7 +119,7 @@ $orb_debug_level = ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_ # Options for all simple tests recognized by the 'client' program. @opts = ( - "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" + "-s -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" . " -ORBSvcConf $cli_cliconffile $orb_debug_level", "-t -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" . " -ORBSvcConf $cli_cliconffile $orb_debug_level", @@ -129,7 +129,7 @@ $orb_debug_level = ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_ . " -ORBSvcConf $cli_cliconffile $orb_debug_level", "-y -ORBInitRef NameService=corbaloc:ssliop:$TARGETHOSTNAME:$ns_ssl_port/NameService" . " -ORBSvcConf $cli_cliconffile $orb_debug_level", - + ); @server_opts = ( @@ -137,13 +137,13 @@ $orb_debug_level = ($quiet || $debug_level == 0) ? "" : "-ORBDebugLevel $debug_ . " -ORBSvcConf $ns_nsconffile $orb_debug_level", "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" . " -ORBSvcConf $ns_nsconffile $orb_debug_level", - "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" + "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" . " -ORBSvcConf $ns_nsconffile $orb_debug_level", - "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" + "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" . " -ORBSvcConf $ns_nsconffile $orb_debug_level", - "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" + "-ORBEndpoint iiop://$TARGETHOSTNAME:$ns_orb_port/ssl_port=$ns_ssl_port" . " -ORBSvcConf $ns_nsconffile $orb_debug_level", - + ); @comments = ( @@ -165,7 +165,7 @@ foreach $o (@opts) { print STDERR " - Skipping, use -s to run the SSL tests"; next; } - + print STDERR "\n"; name_server ($server_opts[$test_number]); client ($o); diff --git a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl index d0650d5d6b9..5544216a4a3 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl +++ b/TAO/orbsvcs/tests/ior_corbaname/corbaname.idl @@ -2,19 +2,19 @@ module corbaname { - + interface Status { // = TITLE - // A simple interface to check the status of + // A simple interface to check the status of // connection between the client and the server. // // = DESCRIPTION // Prints out the status. boolean print_status (); - // Return <true> if the server received the + // Return <true> if the server received the // request from the client. - + }; }; diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp index 63fc5154dae..af17d6f4cd6 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp +++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp @@ -35,17 +35,17 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); - + CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); - + PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); TAO_Notify_Service* notify_service = TAO_Notify_Service::load_default (); - + if (notify_service == 0) { error ("Unable to load the Notify Service"); @@ -59,7 +59,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) notify_service->create (poa.in (), ecf_name.c_str ()); NotifyMonitoringExt::EventChannelFactory_var monitor_ec_factory = NotifyMonitoringExt::EventChannelFactory::_narrow (ecf.in ()); - + if (CORBA::is_nil (monitor_ec_factory.in ())) { error ("Unable to create the Monitoring Event Channel Factory"); @@ -69,7 +69,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) CosNotification::AdminProperties admin_prop; CosNotifyChannelAdmin::ChannelID id; const ACE_CString ec_name ("test1"); - + CosNotifyChannelAdmin::EventChannel_var ec = monitor_ec_factory->create_named_channel (qos_prop, admin_prop, @@ -77,7 +77,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ec_name.c_str ()); NotifyMonitoringExt::EventChannel_var mec = NotifyMonitoringExt::EventChannel::_narrow (ec.in ()); - + if (CORBA::is_nil (mec.in ())) { error ("Unable to narrow the event channel"); @@ -104,9 +104,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ecf_name + "/" + ACE_CString (NotifyMonitoringExt::InactiveEventChannelCount); - + Monitor_Base* stat = instance->get (stat_name); - + if (stat == 0) { error ("Could not find InactiveEventChannelCount statistic"); @@ -114,7 +114,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stat->update (); double count = stat->last_sample (); - + if (count != 1) { error ("Invalid inactive event channel count"); @@ -124,9 +124,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ecf_name + "/" + ACE_CString (NotifyMonitoringExt::ActiveEventChannelCount); - + stat = instance->get (stat_name); - + if (stat == 0) { error ("Could not find ActiveEventChannelCount statistic"); @@ -134,7 +134,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stat->update (); count = stat->last_sample (); - + if (count != 0) { error ("Invalid active event channel count"); @@ -144,9 +144,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) ecf_name + "/" + ACE_CString (NotifyMonitoringExt::InactiveEventChannelNames); - + stat = instance->get (stat_name); - + if (stat == 0) { error ("Could not find InactiveEventChannels statistic"); @@ -154,14 +154,14 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stat->update (); Monitor_Control_Types::NameList list = stat->get_list (); - + if (list.size () != 1) { error ("Invalid inactive event channel list"); } ACE_CString full_ec_name (ecf_name + "/" + ec_name); - + if (list[0] != full_ec_name) { error ("Wrong event channel name"); @@ -179,7 +179,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) mec->named_new_for_suppliers (CosNotifyChannelAdmin::AND_OP, aid, "TestSupplierAdmin"); - + error ("Expected a SupplierAdmin " "NotifyMonitoringExt::NameAlreadyUsed exception"); } @@ -197,7 +197,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) NotifyMonitoringExt::SupplierAdmin_var madmin = NotifyMonitoringExt::SupplierAdmin::_narrow (admin.in ()); - + if (CORBA::is_nil (madmin.in ())) { error ("Could not narrow the supplier admin"); @@ -215,7 +215,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) CosNotifyChannelAdmin::ProxyConsumer_var fake = madmin->obtain_named_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, pid, "supplier"); - + error ("Expected a ProxyConsumer " "NotifyMonitoringExt::NameAlreadyUsed exception"); } @@ -230,9 +230,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) + ec_name + "/" + ACE_CString (NotifyMonitoringExt::EventChannelSupplierCount); - + stat = instance->get (stat_name); - + if (stat == 0) { error ("Could not find the event channel suppliers statistic"); @@ -240,7 +240,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stat->update (); count = stat->last_sample (); - + if (count != 1) { error ("Invalid supplier count"); @@ -277,7 +277,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) mec->named_new_for_consumers (CosNotifyChannelAdmin::AND_OP, aid, "TestConsumerAdmin"); - + error ("Expected a ConsumerAdmin " "NotifyMonitoringExt::NameAlreadyUsed exception"); } @@ -295,7 +295,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) NotifyMonitoringExt::ConsumerAdmin_var mcadmin = NotifyMonitoringExt::ConsumerAdmin::_narrow (cadmin.in ()); - + if (CORBA::is_nil (mcadmin.in ())) { error ("Could not narrow the consumer admin"); @@ -314,7 +314,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) CosNotifyChannelAdmin::STRUCTURED_EVENT, pid, "consumer"); - + error ("Expected a ProxySupplier " "NotifyMonitoringExt::NameAlreadyUsed exception"); } @@ -329,9 +329,9 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) + ec_name + "/" + ACE_CString (NotifyMonitoringExt::EventChannelConsumerCount); - + stat = instance->get (stat_name); - + if (stat == 0) { error ("Could not find the event channel consumers statistic"); @@ -339,7 +339,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) stat->update (); count = stat->last_sample (); - + if (count != 1) { error ("Invalid consumer count"); diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp index 2db160fceb1..08b8129472b 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp +++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp @@ -27,7 +27,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) counter.receive (0.0); counter.receive (0.0); counter.receive (0.0); - + if (counter.last_sample() != 3) { error ("Counter Monitor_Control::receive() failed"); @@ -40,22 +40,22 @@ ACE_TMAIN (int, ACE_TCHAR*[]) number.receive (size); size = 42; number.receive (size); - + if (number.average () != 20) { error ("Number Monitor_Base::average() failed"); } - + if (number.minimum_sample () != 8) { error ("Number Monitor_Base::minimum_sample() failed"); } - + if (number.maximum_sample () != 42) { error ("Number Monitor_Base::maximum_sample() failed"); } - + if (number.sum_of_squares () != 1928) { error ("Number Monitor_Base::sum_of_squares() failed"); @@ -65,17 +65,17 @@ ACE_TMAIN (int, ACE_TCHAR*[]) stime.receive (1183466309.01234); stime.receive (1183466377.9922); stime.receive (1083466309.88374); - + if (stime.average () != 1150132998.96276) { error ("Time Monitor_Base::average() failed"); } - + if (stime.minimum_sample () != 1083466309.88374) { error ("Time Monitor_Base::minimum_sample() failed"); } - + if (stime.maximum_sample () != 1183466377.9922) { error ("Time Monitor_Base::maximum_sample() failed"); @@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) interval.receive (.8); interval.receive (.1); interval.receive (.42); - + // This multiplication and casting is necessary since the machine // representation of the floating point values in the receive() // calls are not exactly what is represented by the text of the code. @@ -93,17 +93,17 @@ ACE_TMAIN (int, ACE_TCHAR*[]) { error ("Interval Monitor_Base::average() failed"); } - + if (interval.minimum_sample () != .1) { error ("Interval Monitor_Base::minimum_sample() failed"); } - + if (interval.maximum_sample () != .8) { error ("Interval Monitor_Base::maximum_sample() failed"); } - + if (static_cast<int> (interval.sum_of_squares () * 10000) != 8264) { error ("Interval Monitor_Base::sum_of_squares() failed"); @@ -115,7 +115,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) l.push_back ("two"); l.push_back ("three"); list.receive (l); - + if (list.count () != 3) { error ("List Monitor_Base::receive() failed"); diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp index c3f330b31b8..6d3a54b2593 100644 --- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp +++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp @@ -29,7 +29,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) // Test registry acquisition. Monitor_Point_Registry* reg = Monitor_Point_Registry::instance (); - + if (reg == 0) { error ("Monitor_Point_Registry::instance() failed"); @@ -75,7 +75,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) Monitor_Base ("test1", Monitor_Control_Types::MC_COUNTER), 2); - + if (reg->add (s) == false) { error ("re-addition Monitor_Point_Registry::add() failed"); @@ -85,7 +85,7 @@ ACE_TMAIN (int, ACE_TCHAR*[]) Monitor_Base ("test2", Monitor_Control_Types::MC_NUMBER), 2); - + if (reg->add (s) == false) { error ("second Monitor_Point_Registry::add() failed"); diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp index edc28721c2c..c73da275657 100644 --- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp +++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp @@ -16,14 +16,14 @@ public: virtual int visit_constraint (TAO_Unary_Constraint*); virtual int visit_with (TAO_Unary_Constraint*) { return 1; } - virtual int visit_min (TAO_Unary_Constraint*) { return 1; } - virtual int visit_max (TAO_Unary_Constraint*) { return 1; } + virtual int visit_min (TAO_Unary_Constraint*) { return 1; } + virtual int visit_max (TAO_Unary_Constraint*) { return 1; } virtual int visit_first (TAO_Noop_Constraint*) { return 1; } virtual int visit_random (TAO_Noop_Constraint*) { return 1; } virtual int visit_and (TAO_Binary_Constraint*) { return 1; } - virtual int visit_or (TAO_Binary_Constraint*) { return 1; } - virtual int visit_not (TAO_Unary_Constraint*) { return 1; } + virtual int visit_or (TAO_Binary_Constraint*) { return 1; } + virtual int visit_not (TAO_Unary_Constraint*) { return 1; } virtual int visit_exist (TAO_Unary_Constraint*) { return 1; } virtual int visit_unary_minus (TAO_Unary_Constraint*) { return 1; } @@ -31,7 +31,7 @@ public: virtual int visit_add (TAO_Binary_Constraint*) { return 1; } virtual int visit_sub (TAO_Binary_Constraint*) { return 1; } virtual int visit_mult (TAO_Binary_Constraint*) { return 1; } - virtual int visit_div (TAO_Binary_Constraint*) { return 1; } + virtual int visit_div (TAO_Binary_Constraint*) { return 1; } virtual int visit_twiddle (TAO_Binary_Constraint*) { return 1; } virtual int visit_in (TAO_Binary_Constraint*) { return 1; } diff --git a/TAO/performance-tests/Anyop/test.idl b/TAO/performance-tests/Anyop/test.idl index f9a3350f85a..e5ea88b0627 100644 --- a/TAO/performance-tests/Anyop/test.idl +++ b/TAO/performance-tests/Anyop/test.idl @@ -346,7 +346,7 @@ interface Param_Test // Use of forward due to deprecation of anonymous types // Test used to use anon type to define the children value. - + struct Recursive_Struct; typedef sequence<Recursive_Struct> Recursive_Seq; diff --git a/TAO/performance-tests/Callback/callback.idl b/TAO/performance-tests/Callback/callback.idl index 7ac2851dc01..690687b4287 100644 --- a/TAO/performance-tests/Callback/callback.idl +++ b/TAO/performance-tests/Callback/callback.idl @@ -9,7 +9,7 @@ module Test { /// we stick the native high resolution timer value there. typedef unsigned long long TimeStamp; - /// Simulated + /// Simulated typedef sequence<octet> Payload; /// Define the callback interface diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl index 92b4d12154a..68ce2b6165b 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/cubit.idl @@ -149,9 +149,9 @@ interface Cubit void cube_rti_data (in RtiPacket input, out RtiPacket output); - + // A work around for problems with SHMIOP since this test uses - // this. + // this. void ping (); }; diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl index 7fb96cdaf75..07761f56263 100755 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl @@ -55,7 +55,7 @@ for (my $i = 0; $i <= $#ARGV; $i++) { $server_flags .= " -ORBgioplite "; } else { - print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n"; + print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n"; } } diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java index eecd5e3a51d..e4d08144069 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit_Client.java @@ -1,7 +1,7 @@ // $Id$ // // ============================================================================ -// +// // = FILENAME // IDL_Cubit_Client.java // @@ -19,41 +19,41 @@ public class IDL_Cubit_Client { - + private org.omg.CORBA.ORB orb_; private org.omg.CORBA.Object naming_service_object_; public void init (String[] args) { - try { - + try { + orb_ = org.omg.CORBA.ORB.init (args, null); - + // Get the Naming Service initial reference System.out.println ("Using the lookup protocol!"); NS_Resolve ns_resolve = new NS_Resolve (); naming_service_object_ = ns_resolve.resolve_name_service (orb_); - - } + + } catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory constructor: ORB and Name Service initialization"); System.err.println(e); - } - + } + } - - + + public void run () { try { - + // Get the Naming Context to allow resolving the EventService and // ScheduleService - CosNaming.NamingContext naming_context = + CosNaming.NamingContext naming_context = CosNaming.NamingContextHelper.narrow (naming_service_object_); - + if (naming_context == null) { System.err.println ("The Naming Context is null"); @@ -65,21 +65,21 @@ public class IDL_Cubit_Client cubit_factory_name[0] = new CosNaming.NameComponent ("IDL_Cubit",""); cubit_factory_name[1] = new CosNaming.NameComponent ("cubit_factory",""); org.omg.CORBA.Object factory_obj = naming_context.resolve (cubit_factory_name); - + if (factory_obj == null) { System.err.println ("Factory object is nil!"); return; } - + Cubit_Factory cubit_Factory = Cubit_FactoryHelper.narrow (factory_obj); - + Cubit cubit = cubit_Factory.make_cubit ("key0"); short x = 4; - - System.out.println ("The call cube_short (4) results in: " +cubit.cube_short (x)); - + + System.out.println ("The call cube_short (4) results in: " +cubit.cube_short (x)); + } catch (CosNaming.NamingContextPackage.CannotProceed e) { @@ -94,22 +94,22 @@ public class IDL_Cubit_Client catch (CosNaming.NamingContextPackage.NotFound e) { System.err.println ("CosNaming.NamingContextPackage.NotFound"); - System.err.println (e); + System.err.println (e); } - catch(org.omg.CORBA.SystemException e) + catch(org.omg.CORBA.SystemException e) { System.err.println ("PushConsumerFactory.run: Failure"); System.err.println(e); - } - } + } + } + + public static void main (String[] args) { - public static void main (String[] args) { - IDL_Cubit_Client cubit_Client = new IDL_Cubit_Client (); cubit_Client.init (args); - + cubit_Client.run (); - } + } } // public class IDL_Cubit_Client diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh index 7cebd21319c..eede6124534 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/benchmark.sh @@ -10,11 +10,11 @@ set -e -for protocol in iiop uiop; do +for protocol in iiop uiop; do for test in void octet short long struct union \ small_octet_seq small_long_seq small_struct_seq \ large_octet_seq large_long_seq large_struct_seq \ - mixin rti_data one_way; do + mixin rti_data one_way; do echo "Running IDL_Cubit $test test for $protocol..." ./server -f ior -ORBEndpoint $protocol:// \ > $test.$protocol.server 2>&1 & diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl index 92b4d12154a..68ce2b6165b 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/cubit.idl @@ -149,9 +149,9 @@ interface Cubit void cube_rti_data (in RtiPacket input, out RtiPacket output); - + // A work around for problems with SHMIOP since this test uses - // this. + // this. void ping (); }; diff --git a/TAO/performance-tests/Latency/AMI/run_test.pl b/TAO/performance-tests/Latency/AMI/run_test.pl index 535ae12c791..c267d544932 100755 --- a/TAO/performance-tests/Latency/AMI/run_test.pl +++ b/TAO/performance-tests/Latency/AMI/run_test.pl @@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-i $iterations " . + "-i $iterations " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/performance-tests/Latency/Collocation/Test.idl b/TAO/performance-tests/Latency/Collocation/Test.idl index b2d07dbf880..3f26904a3f0 100644 --- a/TAO/performance-tests/Latency/Collocation/Test.idl +++ b/TAO/performance-tests/Latency/Collocation/Test.idl @@ -1,5 +1,5 @@ // -// $Id$ +// $Id$ // /// A simple module to avoid namespace pollution @@ -21,6 +21,6 @@ module Test Timestamp test_method (in Timestamp send_time); /// Shutdown the ORB - void shutdown (); + void shutdown (); }; -}; +}; diff --git a/TAO/performance-tests/Latency/DII/run_test.pl b/TAO/performance-tests/Latency/DII/run_test.pl index af7dc20c0f4..8096a73c1b7 100755 --- a/TAO/performance-tests/Latency/DII/run_test.pl +++ b/TAO/performance-tests/Latency/DII/run_test.pl @@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-i $iterations " . + "-i $iterations " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/performance-tests/Latency/DSI/run_test.pl b/TAO/performance-tests/Latency/DSI/run_test.pl index 7667dd9339c..e12ef504ca5 100755 --- a/TAO/performance-tests/Latency/DSI/run_test.pl +++ b/TAO/performance-tests/Latency/DSI/run_test.pl @@ -29,12 +29,12 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-i $iterations " . + "-i $iterations " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/performance-tests/Latency/Deferred/run_test.pl b/TAO/performance-tests/Latency/Deferred/run_test.pl index 834bc362f68..abbead4fb14 100755 --- a/TAO/performance-tests/Latency/Deferred/run_test.pl +++ b/TAO/performance-tests/Latency/Deferred/run_test.pl @@ -30,12 +30,12 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-i $iterations -b $burst" . + "-i $iterations -b $burst" . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl b/TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl index 4ce8e018317..10eda0f8a92 100755 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/run_test.pl @@ -32,7 +32,7 @@ for ($iter = 0; $iter <= $#ARGV; $iter++) { $iterations = $ARGV[$iter + 1]; $i++; } - + } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/TAO/performance-tests/Protocols/test.idl b/TAO/performance-tests/Protocols/test.idl index e2836f798ee..33f1a21606a 100644 --- a/TAO/performance-tests/Protocols/test.idl +++ b/TAO/performance-tests/Protocols/test.idl @@ -13,7 +13,7 @@ interface test oneway void oneway_sync (); void twoway_sync (); - + void shutdown (); typedef sequence<octet> octets; @@ -21,8 +21,8 @@ interface test oneway void oneway_method (in long session_id, in unsigned long iteration, in octets payload); - + void twoway_method (inout long session_id, inout unsigned long iteration, - inout octets payload); + inout octets payload); }; diff --git a/TAO/performance-tests/Protocols/toggle_link.pl b/TAO/performance-tests/Protocols/toggle_link.pl index 88908ac5052..0f46435c770 100755 --- a/TAO/performance-tests/Protocols/toggle_link.pl +++ b/TAO/performance-tests/Protocols/toggle_link.pl @@ -25,7 +25,7 @@ $start_seconds = timelocal ($now->sec, $now->min, $now->hour, $now->mday, $now-> print_with_time ("L1 UP"); system ($L1_UP); -print_with_time ("L2 DOWN"); +print_with_time ("L2 DOWN"); system ($L2_DOWN); select undef, undef, undef, $phasetime; @@ -57,7 +57,7 @@ for (;;) select undef, undef, undef, $sleeptime; } -sub print_with_time +sub print_with_time { $now = localtime; $now_seconds = timelocal ($now->sec, $now->min, $now->hour, $now->mday, $now->mon, $now->year); diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl index c82766dbfcc..96394cdac44 100755 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl @@ -91,7 +91,7 @@ if ($all == 1) { foreach $type (@types) { my $transport = ""; my $shutdown = ""; - + if ($type == "none" || $type == "transport") { $transport = "-ORBNodelay 0"; } diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl index 2f5effbe44e..5a0a2cdd861 100755 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl @@ -117,7 +117,7 @@ if ($client->PutFile ($iorbase) == -1) { if ($all == 1) { foreach $bufsize (@bufsizes) { print STDERR "\n***************** STARTING TEST ******************\n"; - + $CL->Arguments ("-k file://$client_iorfile -ORBNodelay 0 -l $level ". "-t none -i $iterations -m $bufsize"); @@ -138,7 +138,7 @@ foreach $type (@types) { print STDERR "\n***************** STARTING TEST ******************\n"; my $transport = ""; - + if ($type == "none" || $type == "transport") { $transport = "-ORBNodelay 0"; } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl index 3114614a725..e131b9edacb 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl @@ -4,8 +4,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -template<typename T> -ACE_INLINE +template<typename T> +ACE_INLINE CORBA::Boolean TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr) { diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl index f1fa29d7a4c..2196fba3f3e 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl @@ -5,8 +5,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -template<typename T> -ACE_INLINE +template<typename T> +ACE_INLINE CORBA::Boolean TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr) { diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Impl_T.inl index d459bc57e67..afd8d7fac29 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl @@ -6,8 +6,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // These three are overridden in generated code where appropriate. -template<typename T> -ACE_INLINE +template<typename T> +ACE_INLINE CORBA::Boolean TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr) { diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl index 257a7681bd9..c4ca231a618 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl @@ -4,8 +4,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -template<typename T, typename from_T, typename to_T> -ACE_INLINE +template<typename T, typename from_T, typename to_T> +ACE_INLINE CORBA::Boolean TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value ( TAO_InputCDR &cdr diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index 6d163fe0703..8d1629d7e57 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -24,7 +24,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Basic_Clonable_Argument_T<S,Insert_Policy>::In_Basic_Clonable_Argument_T (S const & x) - : In_Basic_Argument_T<S,Insert_Policy> (x), + : In_Basic_Argument_T<S,Insert_Policy> (x), is_clone_ (false) {} diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 204f247c996..13ec26dc110 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -80,7 +80,7 @@ TAO_OutputCDR::get_codebase_url_map () } #endif -ACE_INLINE TAO_OutputCDR::Value_Map_Handle& +ACE_INLINE TAO_OutputCDR::Value_Map_Handle& TAO_OutputCDR::get_value_map () { return this->value_map_; diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl index 5e94cf5401e..6f9ad7e08f2 100644 --- a/TAO/tao/CSD_Framework/CSD_POA.inl +++ b/TAO/tao/CSD_Framework/CSD_POA.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO::CSD::Strategy_Proxy& +TAO::CSD::Strategy_Proxy& TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const { return *sds_proxy_; diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl index a8d9aaaa243..1bd49df4e0c 100644 --- a/TAO/tao/DynamicAny/DynamicAny.pidl +++ b/TAO/tao/DynamicAny/DynamicAny.pidl @@ -50,18 +50,18 @@ module DynamicAny void assign (in DynAny dyn_any) raises (TypeMismatch); - + void from_any (in any value) raises (TypeMismatch, InvalidValue); - + any to_any (); - + boolean equal (in DynAny dyn_any); - + void destroy (); - + DynAny copy (); - + void insert_boolean (in boolean value) raises (TypeMismatch, InvalidValue); void insert_octet (in octet value) @@ -145,19 +145,19 @@ module DynamicAny raises (TypeMismatch, InvalidValue); boolean seek (in long index); - + void rewind (); - + boolean next (); - + unsigned long component_count (); - + DynAny current_component () raises (TypeMismatch); - + void insert_abstract (in CORBA::AbstractBase value) raises (TypeMismatch, InvalidValue); - + CORBA::AbstractBase get_abstract () raises (TypeMismatch, InvalidValue); @@ -178,7 +178,7 @@ module DynamicAny void insert_float_seq (in CORBA::FloatSeq value) raises (TypeMismatch, InvalidValue); void insert_double_seq (in CORBA::DoubleSeq value) - raises (TypeMismatch, InvalidValue); + raises (TypeMismatch, InvalidValue); void insert_longlong_seq (in CORBA::LongLongSeq value) raises (TypeMismatch, InvalidValue); void insert_ulonglong_seq (in CORBA::ULongLongSeq value) @@ -187,7 +187,7 @@ module DynamicAny raises (TypeMismatch, InvalidValue); void insert_wchar_seq (in CORBA::WCharSeq value) raises (TypeMismatch, InvalidValue); - + CORBA::BooleanSeq get_boolean_seq () raises (TypeMismatch, InvalidValue); CORBA::OctetSeq get_octet_seq() @@ -219,7 +219,7 @@ module DynamicAny local interface DynFixed : DynAny { string get_value (); - + boolean set_value (in string val) raises (TypeMismatch, InvalidValue); }; @@ -227,18 +227,18 @@ module DynamicAny local interface DynEnum : DynAny { string get_as_string (); - + void set_as_string (in string value) raises (InvalidValue); - + unsigned long get_as_ulong (); - + void set_as_ulong (in unsigned long value) raises (InvalidValue); }; - + typedef string FieldName; - + struct NameValuePair { FieldName id; @@ -246,7 +246,7 @@ module DynamicAny }; typedef sequence<NameValuePair> NameValuePairSeq; - + struct NameDynAnyPair { FieldName id; @@ -254,22 +254,22 @@ module DynamicAny }; typedef sequence<NameDynAnyPair> NameDynAnyPairSeq; - + local interface DynStruct : DynAny { FieldName current_member_name () raises (TypeMismatch, InvalidValue); - + CORBA::TCKind current_member_kind () raises (TypeMismatch, InvalidValue); - + NameValuePairSeq get_members (); - + void set_members (in NameValuePairSeq value) raises (TypeMismatch, InvalidValue); - + NameDynAnyPairSeq get_members_as_dyn_any (); - + void set_members_as_dyn_any (in NameDynAnyPairSeq value) raises (TypeMismatch, InvalidValue); }; @@ -277,46 +277,46 @@ module DynamicAny local interface DynUnion : DynAny { DynAny get_discriminator (); - + void set_discriminator (in DynAny d) raises (TypeMismatch); - + void set_to_default_member () raises (TypeMismatch); - + void set_to_no_active_member () raises (TypeMismatch); - + boolean has_no_active_member (); - + CORBA::TCKind discriminator_kind (); - + DynAny member () raises (InvalidValue); - + FieldName member_name () raises (InvalidValue); - + CORBA::TCKind member_kind () raises (InvalidValue); }; typedef sequence<any> AnySeq; typedef sequence<DynAny> DynAnySeq; - + local interface DynSequence : DynAny { unsigned long get_length (); - + void set_length (in unsigned long len) raises (InvalidValue); - + AnySeq get_elements (); - + void set_elements (in AnySeq value) raises (TypeMismatch, InvalidValue); - + DynAnySeq get_elements_as_dyn_any (); - + void set_elements_as_dyn_any (in DynAnySeq value) raises (TypeMismatch, InvalidValue); }; @@ -324,12 +324,12 @@ module DynamicAny local interface DynArray : DynAny { AnySeq get_elements (); - + void set_elements (in AnySeq value) raises (TypeMismatch, InvalidValue); - + DynAnySeq get_elements_as_dyn_any (); - + void set_elements_as_dyn_any (in DynAnySeq value) raises (TypeMismatch, InvalidValue); }; @@ -337,9 +337,9 @@ module DynamicAny local interface DynValueCommon : DynAny { boolean is_null (); - + void set_to_null (); - + void set_to_value (); }; @@ -347,17 +347,17 @@ module DynamicAny { FieldName current_member_name () raises (TypeMismatch, InvalidValue); - + CORBA::TCKind current_member_kind () raises (TypeMismatch, InvalidValue); - + NameValuePairSeq get_members (); - + void set_members (in NameValuePairSeq value) raises (TypeMismatch, InvalidValue); - + NameDynAnyPairSeq get_members_as_dyn_any (); - + void set_members_as_dyn_any (in NameDynAnyPairSeq value) raises (TypeMismatch, InvalidValue); }; @@ -366,35 +366,35 @@ module DynamicAny { any get_boxed_value () raises (InvalidValue); - + void set_boxed_value (in any boxed) raises (TypeMismatch, InvalidValue); - + DynAny get_boxed_value_as_dyn_any () raises (InvalidValue); - + void set_boxed_value_as_dyn_any (in DynAny boxed) raises (TypeMismatch); }; - + exception MustTruncate {}; local interface DynAnyFactory { exception InconsistentTypeCode {}; - + DynAny create_dyn_any (in any value) raises (InconsistentTypeCode); DynAny create_dyn_any_from_type_code (in CORBA::TypeCode type) raises (InconsistentTypeCode); - + DynAny create_dyn_any_without_truncation (in any value) raises (InconsistentTypeCode, MustTruncate); - + DynAnySeq create_multiple_dyn_anys (in AnySeq values, in boolean allow_truncate) raises (InconsistentTypeCode, MustTruncate); - + AnySeq create_multiple_anys (in DynAnySeq values); }; }; // module DynamicAny diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl index 8d1d4bf1c27..9582cb0c1bb 100644 --- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl +++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl @@ -17,13 +17,13 @@ module PortableInterceptor { typeprefix PortableInterceptor "omg.org"; - abstract valuetype ObjectReferenceFactory + abstract valuetype ObjectReferenceFactory { Object make_object (in string repository_id, in ObjectId id); }; - abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory + abstract valuetype ObjectReferenceTemplate : ObjectReferenceFactory { readonly attribute ServerId server_id; readonly attribute ORBId orb_id; diff --git a/TAO/tao/Object.inl b/TAO/tao/Object.inl index 9c645170e8c..7dfe8654fa9 100644 --- a/TAO/tao/Object.inl +++ b/TAO/tao/Object.inl @@ -15,7 +15,7 @@ CORBA::is_nil<> (CORBA::Object_ptr obj) { return true; } - + return CORBA::Object::is_nil_i (obj); } diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 2da226b541a..0fecfabf643 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -58,7 +58,7 @@ namespace TAO retval = this->purge_entry_i (cached_entry); } } - + return retval; } diff --git a/TAO/tao/ZIOP/ZIOP.pidl b/TAO/tao/ZIOP/ZIOP.pidl index 4c7ef2648bd..a52c91fc898 100644 --- a/TAO/tao/ZIOP/ZIOP.pidl +++ b/TAO/tao/ZIOP/ZIOP.pidl @@ -56,7 +56,7 @@ module ZIOP }; /** - * The ZIOP CompressionMinRatioPolicy. If the compression ratio is smaller + * The ZIOP CompressionMinRatioPolicy. If the compression ratio is smaller * than this setting, a message is send uncompressed. */ const CORBA::PolicyType COMPRESSION_MIN_RATIO_POLICY_ID = 67; diff --git a/TAO/tests/AMH_Exceptions/Test.idl b/TAO/tests/AMH_Exceptions/Test.idl index 6a9ae77044b..6f4030410f4 100644 --- a/TAO/tests/AMH_Exceptions/Test.idl +++ b/TAO/tests/AMH_Exceptions/Test.idl @@ -8,7 +8,7 @@ module Test exception InvalidTimestamp {}; exception ServerOverload {}; - + /// Use a timestamp to measure the roundtrip delay typedef unsigned long long Timestamp; diff --git a/TAO/tests/AMI/ami_test.idl b/TAO/tests/AMI/ami_test.idl index 04005e9531f..44853a82706 100644 --- a/TAO/tests/AMI/ami_test.idl +++ b/TAO/tests/AMI/ami_test.idl @@ -33,7 +33,7 @@ module A void inout_arg_test (inout string str); }; - + interface Test_Child : AMI_Test { void child_op (); diff --git a/TAO/tests/AMI_Timeouts/timeout.idl b/TAO/tests/AMI_Timeouts/timeout.idl index 64aa8c189c5..d5c979d58bb 100644 --- a/TAO/tests/AMI_Timeouts/timeout.idl +++ b/TAO/tests/AMI_Timeouts/timeout.idl @@ -1,6 +1,6 @@ // // $Id$ -// +// // ============================================================================ // diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp index ff7cfae34e7..997152d5731 100644 --- a/TAO/tests/Alt_Mapping/client.cpp +++ b/TAO/tests/Alt_Mapping/client.cpp @@ -145,7 +145,7 @@ Alt_Mapping_Client<T>::run_sii_test (void) "********** Finished running %s SII *********\n", opname)); } - + return this->results_.error_count ()? -1 : 0; } diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp index 1a5c6380d8c..637782e2ba7 100644 --- a/TAO/tests/Alt_Mapping/driver.cpp +++ b/TAO/tests/Alt_Mapping/driver.cpp @@ -123,7 +123,7 @@ Driver::run (void) this->objref_.in(), new Test_Unbounded_String); retstatus = client->run_sii_test (); - + delete client; } break; @@ -134,9 +134,9 @@ Driver::run (void) this->orb_.in (), this->objref_.in(), new Test_Unbounded_Struct_Sequence); - + retstatus = client->run_sii_test (); - + delete client; Alt_Mapping_Client<Test_Unbounded_Struct_Sequence> *client2 = new diff --git a/TAO/tests/Alt_Mapping/server.cpp b/TAO/tests/Alt_Mapping/server.cpp index 8d86a2403bb..a0098e9d9b4 100644 --- a/TAO/tests/Alt_Mapping/server.cpp +++ b/TAO/tests/Alt_Mapping/server.cpp @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) userex._tao_print_exception ("User Exception"); return -1; } - + /// Free resources. delete svnt; diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp index cdf3746d71c..426b3dfd000 100644 --- a/TAO/tests/Alt_Mapping/ub_string.cpp +++ b/TAO/tests/Alt_Mapping/ub_string.cpp @@ -47,7 +47,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr) this->in_ = gen->gen_string (); this->inout_ = this->in_.c_str (); - + return 0; } @@ -57,7 +57,7 @@ Test_Unbounded_String::reset_parameters (void) this->inout_ = this->in_.c_str (); this->out_.clear (); this->ret_.clear (); - + return 0; } @@ -76,7 +76,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref) { ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n"); } - + return -1; } @@ -87,7 +87,7 @@ Test_Unbounded_String::check_validity (void) std::string first_half = this->inout_.substr (0, len); std::string second_half = this->inout_.substr (len, len); - + return (this->in_ == this->out_ && this->in_ == this->ret_ && this->inout_.length () == 2 * len diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp index 568fafb76b2..c7fdad7fde3 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp @@ -55,7 +55,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr) // set the length of the sequence this->in_.resize (len); this->inout_.resize (len); - + // Now set each individual element. for (CORBA::ULong i = 0; i < this->in_.size (); i++) { @@ -64,7 +64,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr) this->in_[i] = gen->gen_fixed_struct (); this->inout_[i] = gen->gen_fixed_struct (); } - + return 0; } @@ -74,7 +74,7 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void) this->inout_.clear (); this->out_.clear (); this->ret_.clear (); - + return 0; } @@ -134,15 +134,15 @@ Test_Unbounded_Struct_Sequence::compare ( { ACE_CDR::ULong s1v = s1.capacity (); ACE_CDR::ULong s2v = s2.capacity (); - + if (s1v != s2v) { return false; } - + s1v = s1.size (); - s2v = s2.size (); - + s2v = s2.size (); + if (s1v != s2v) { return false; @@ -176,7 +176,7 @@ Test_Unbounded_Struct_Sequence::print_sequence ( s.capacity (), s.size ())); ACE_DEBUG ((LM_DEBUG, "Elements -\n")); - + for (CORBA::ULong i = 0; i < s.size (); i++) { const Alt_Mapping::Fixed_Struct& vs = s[i]; diff --git a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl index d5aa1704cab..47b125f6733 100755 --- a/TAO/tests/Bug_1020_Basic_Regression/run_test.pl +++ b/TAO/tests/Bug_1020_Basic_Regression/run_test.pl @@ -22,7 +22,7 @@ foreach $i (@ARGV) { if ($i eq '-quick') { $elapsed = 0; $max_running_time = 1; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/TAO/tests/Bug_1361_Regression/run_test.pl b/TAO/tests/Bug_1361_Regression/run_test.pl index 8c91f3676f5..8f9467135a1 100755 --- a/TAO/tests/Bug_1361_Regression/run_test.pl +++ b/TAO/tests/Bug_1361_Regression/run_test.pl @@ -18,7 +18,7 @@ foreach $i (@ARGV) { $debug_opts = '-ORBDebugLevel 10 -ORBVerboseLogging 1 ' . '-ORBLogFile client'; $srv_debug = '-ORBDebugLevel 5'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/TAO/tests/Bug_1476_Test/run_test.pl b/TAO/tests/Bug_1476_Test/run_test.pl index c3694f44c0f..fcf92cadd2e 100755 --- a/TAO/tests/Bug_1476_Test/run_test.pl +++ b/TAO/tests/Bug_1476_Test/run_test.pl @@ -29,7 +29,7 @@ my @levels = ("obj", "orb", "thread"); foreach $synch (@synchs) { foreach $level (@levels) { - $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level"); + $CL->Arguments ("-ORBDebuglevel $debug_level -k file://$client_iorfile -s$synch -l$level"); $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 285); diff --git a/TAO/tests/Bug_1495_Regression/run_test.pl b/TAO/tests/Bug_1495_Regression/run_test.pl index bb82da99587..9c3ceb458d1 100755 --- a/TAO/tests/Bug_1495_Regression/run_test.pl +++ b/TAO/tests/Bug_1495_Regression/run_test.pl @@ -35,12 +35,12 @@ my $client_thrserverfile = $client->LocalFile ($thrserverfile); $server->DeleteFile($thrserverfile); $client->DeleteFile($thrserverfile); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorbase " . "-i file://$server_thrserverfile"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level " . "-o $client_thrserverfile " . "-i $client_iorbase"); diff --git a/TAO/tests/Bug_1495_Regression/run_test_complex.pl b/TAO/tests/Bug_1495_Regression/run_test_complex.pl index 006225e2c8a..a4edc3de408 100755 --- a/TAO/tests/Bug_1495_Regression/run_test_complex.pl +++ b/TAO/tests/Bug_1495_Regression/run_test_complex.pl @@ -46,17 +46,17 @@ my $middle_middleserverfile = $middle->LocalFile ($middleserverfile); $middle->DeleteFile($middleserverfile); $middle->DeleteFile($thrserverfile); -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_inputfile " . "-i file://$server_middleserverfile"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-ORBdebuglevel $debug_level " . "-i file://$client_inputfile " . "-o $client_thrserverfile"); -$ML = $middle->CreateProcess ("server", +$ML = $middle->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-i file://$middle_thrserverfile " . "-o $middle_middleserverfile"); diff --git a/TAO/tests/Bug_1568_Regression/run_test.pl b/TAO/tests/Bug_1568_Regression/run_test.pl index 7eee3624c54..e20d93f2b50 100755 --- a/TAO/tests/Bug_1568_Regression/run_test.pl +++ b/TAO/tests/Bug_1568_Regression/run_test.pl @@ -14,7 +14,7 @@ $debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; diff --git a/TAO/tests/Bug_1670_Regression/Test.idl b/TAO/tests/Bug_1670_Regression/Test.idl index 2b43053cca3..de8c78c10db 100644 --- a/TAO/tests/Bug_1670_Regression/Test.idl +++ b/TAO/tests/Bug_1670_Regression/Test.idl @@ -14,7 +14,7 @@ module Foo long op1(); long op2(); }; - + interface B { long op3(); diff --git a/TAO/tests/Bug_2124_Regression/Test.idl b/TAO/tests/Bug_2124_Regression/Test.idl index 641ad61bb7b..4725a402aff 100644 --- a/TAO/tests/Bug_2124_Regression/Test.idl +++ b/TAO/tests/Bug_2124_Regression/Test.idl @@ -6,7 +6,7 @@ */ module Test -{ +{ typedef string<10> MyString; typedef MyString OtherString; diff --git a/TAO/tests/Bug_2186_Regression/Test.idl b/TAO/tests/Bug_2186_Regression/Test.idl index 0f5412c0210..c1a23e8d785 100644 --- a/TAO/tests/Bug_2186_Regression/Test.idl +++ b/TAO/tests/Bug_2186_Regression/Test.idl @@ -16,7 +16,7 @@ module Test * This method is used to simplify the test shutdown process */ oneway void shutdown (); - + void request_callback (in Hello call_me); }; }; diff --git a/TAO/tests/Bug_2678_Regression/dribble.pl b/TAO/tests/Bug_2678_Regression/dribble.pl index 26a561aa58b..3e10a136d4d 100755 --- a/TAO/tests/Bug_2678_Regression/dribble.pl +++ b/TAO/tests/Bug_2678_Regression/dribble.pl @@ -53,7 +53,7 @@ if (!$result) { my($initial) = length($str); my($length) = $initial; my($maxLine) = 78; - + print $str; foreach my $key (sort keys %options) { diff --git a/TAO/tests/Bug_2768_Regression/server.cpp b/TAO/tests/Bug_2768_Regression/server.cpp index 76086da54e8..4e914ca63a0 100644 --- a/TAO/tests/Bug_2768_Regression/server.cpp +++ b/TAO/tests/Bug_2768_Regression/server.cpp @@ -31,7 +31,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) // Indicates sucessful parsing of the command line return 0; } - + int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { try diff --git a/TAO/tests/Bug_2791_Regression/Message.idl b/TAO/tests/Bug_2791_Regression/Message.idl index 728fed86e73..0afd8fb1f25 100755 --- a/TAO/tests/Bug_2791_Regression/Message.idl +++ b/TAO/tests/Bug_2791_Regression/Message.idl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ valuetype Message { diff --git a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp index 82ad8a649bb..742028a19f9 100755 --- a/TAO/tests/Bug_2791_Regression/MessageFactory.cpp +++ b/TAO/tests/Bug_2791_Regression/MessageFactory.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "MessageFactory.h" diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp index d4b5ab0b38a..c66bffc6d72 100755 --- a/TAO/tests/Bug_2791_Regression/Message_i.cpp +++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "Message_i.h" diff --git a/TAO/tests/Bug_2935_Regression/README.txt b/TAO/tests/Bug_2935_Regression/README.txt index d90fcb5a624..141af0bd2d9 100644 --- a/TAO/tests/Bug_2935_Regression/README.txt +++ b/TAO/tests/Bug_2935_Regression/README.txt @@ -1,11 +1,11 @@ ThreeTier Test. -This test was added in response to the bugs reported in bugzilla entries - 2934: -ORBMuxedConnectionMax didn't work correctly, and - 2935: too many connections to a server are opened in nested-upcall or - multithreaed situations. - - +This test was added in response to the bugs reported in bugzilla entries + 2934: -ORBMuxedConnectionMax didn't work correctly, and + 2935: too many connections to a server are opened in nested-upcall or + multithreaed situations. + + The test consists of three processes, source sends requests, middle passes the requests on, and sink actually processes the requests. Because source operates as fast as possible and sink has a delay, the @@ -19,7 +19,7 @@ peer connections that were logged. There should be exactly one. As an aside, these three processes have been very useful in testing various middle tier issues. Of course the best way to address this middle tier type -of application is thru a mixture of AMH and AMI, but that's a topic for a +of application is thru a mixture of AMH and AMI, but that's a topic for a different test. Dale Wilson <wilsond@ociweb.com>
\ No newline at end of file diff --git a/TAO/tests/Bug_2935_Regression/run_test.pl b/TAO/tests/Bug_2935_Regression/run_test.pl index 46c636eea08..64a4acd9aa6 100755 --- a/TAO/tests/Bug_2935_Regression/run_test.pl +++ b/TAO/tests/Bug_2935_Regression/run_test.pl @@ -18,7 +18,7 @@ sub count_matching_lines { } close FILE; return $count; -} +} $status = 0; diff --git a/TAO/tests/Bug_2953_Regression/run_test.pl b/TAO/tests/Bug_2953_Regression/run_test.pl index e05cbec53be..817025c6911 100755 --- a/TAO/tests/Bug_2953_Regression/run_test.pl +++ b/TAO/tests/Bug_2953_Regression/run_test.pl @@ -14,7 +14,7 @@ $debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-debug') { $debug_level = '10'; - } + } } my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; @@ -49,7 +49,7 @@ if ($server->WaitForFileTimed ($iorbaseA, print STDERR "ERROR: cannot find file <$server_iorfileA>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; -} +} $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval ()); diff --git a/TAO/tests/Bug_3068_Regression/run_test.pl b/TAO/tests/Bug_3068_Regression/run_test.pl index 2ec2e3aa918..74ef14252e6 100755 --- a/TAO/tests/Bug_3068_Regression/run_test.pl +++ b/TAO/tests/Bug_3068_Regression/run_test.pl @@ -38,7 +38,7 @@ $SV = $server->CreateProcess ("server", $CL = $client->CreateProcess ("client", "-ORBSvcConf $client_conf " . "-k file://$client_iorfile"); - + $server_status = $SV->Spawn (); if ($server_status != 0) { diff --git a/TAO/tests/Bug_3154_Regression/test.idl b/TAO/tests/Bug_3154_Regression/test.idl index e4ec773839e..6534517b2cd 100644 --- a/TAO/tests/Bug_3154_Regression/test.idl +++ b/TAO/tests/Bug_3154_Regression/test.idl @@ -147,7 +147,7 @@ module FT * creation of a member of an object group, and to determine where the member * is created. * - * @param object_group Reference for the object group to which the member is + * @param object_group Reference for the object group to which the member is * to be added. * @param the_location The physical location. * @param type_id The repository identifier for the type of the object. @@ -167,10 +167,10 @@ module FT CannotMeetCriteria); /** - * This operation allows an application to add an existing object to an object + * This operation allows an application to add an existing object to an object * group at a particular location. * - * @param object_group Reference for the object group to which the existing object + * @param object_group Reference for the object group to which the existing object * is to be added. * @param the_location The physical location of the object to be added. * @param member The reference of the object to be added. @@ -184,10 +184,10 @@ module FT ObjectNotAdded); /** - * This operation allows an application to remove a member from an object + * This operation allows an application to remove a member from an object * group at a particular location. * - * @param object_group Reference for the object group to which the member + * @param object_group Reference for the object group to which the member * is to be removed. * @param the_location The physical location of the member to be removed. * @@ -196,17 +196,17 @@ module FT ObjectGroup remove_member(in ObjectGroup object_group) raises(ObjectGroupNotFound, MemberNotFound); - + /** - * This operation allows the application to select the member of the object group + * This operation allows the application to select the member of the object group * that is to be the primary. * - * @param object_group Reference for the object group whose primary is to be + * @param object_group Reference for the object group whose primary is to be * determined. - * @param the_location The physical location of the member that is to become + * @param the_location The physical location of the member that is to become * the primary. * - * @return The object group reference with the primary member at the given + * @return The object group reference with the primary member at the given * location. */ ObjectGroup set_primary_member(in ObjectGroup object_group) @@ -235,18 +235,18 @@ module FT typedef any FactoryCreationId; /** - * This operation creates an object or an object group, using the type_id + * This operation creates an object or an object group, using the type_id * parameter to determine which type of object to create and the_criteria - * parameter to determine restrictions on how and where to create the object. + * parameter to determine restrictions on how and where to create the object. * - * @param type_id The repository identifier of the object to be created by + * @param type_id The repository identifier of the object to be created by * the factory. - * + * * @param the_criteria Information passed to the factory, which the factory * evaluates before creating the object. Examples of criteria are initialization * values, constraints on the object, preferred location of the object, fault * tolerance properties for an object group, etc. - * + * * @param factory_creation_id An identifier that allows the factory to delete * the object subsequently. * diff --git a/TAO/tests/Bug_3513_Regression/test.idl b/TAO/tests/Bug_3513_Regression/test.idl index a358eda8ab2..ae55732a3e3 100644 --- a/TAO/tests/Bug_3513_Regression/test.idl +++ b/TAO/tests/Bug_3513_Regression/test.idl @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* We've added a comment to the effect that this file does not contain the following diff --git a/TAO/tests/Bug_3531_Regression/run_test.pl b/TAO/tests/Bug_3531_Regression/run_test.pl index c6929f8976c..4abf90d2143 100755 --- a/TAO/tests/Bug_3531_Regression/run_test.pl +++ b/TAO/tests/Bug_3531_Regression/run_test.pl @@ -52,7 +52,7 @@ my @CLS = (); for($i = 0; $i < $num_clients - 1; $i++) { $CLS[$i] = $clients[$i]->CreateProcess ("client", "-k file://$clients_iorfile[$i]"); } -$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client", +$CLS[$num_clients - 1] = $clients[$i]->CreateProcess ("client", "-k file://$clients_iorfile[$num_clients - 1] -x"); # start server and wait for file diff --git a/TAO/tests/Bug_3543_Regression/README.txt b/TAO/tests/Bug_3543_Regression/README.txt index 15da44fb5b0..0f6c6b7bc78 100644 --- a/TAO/tests/Bug_3543_Regression/README.txt +++ b/TAO/tests/Bug_3543_Regression/README.txt @@ -1,7 +1,7 @@ $Id$ This test is a reproducer for bug 3543. The master starts and waits until all servers -have registered. Then master starts pinging all the servers with 10 threads. At that +have registered. Then master starts pinging all the servers with 10 threads. At that moment multiple threads are waiting for the same connection to a specific server. We observed at that moment that in TAO_Transport::register_if_necessary the check for is_registered returns false, then we get a thread switch and another thread then diff --git a/TAO/tests/Bug_3553_Regression/run_test.pl b/TAO/tests/Bug_3553_Regression/run_test.pl index 1a8599748b6..fb3f7a003bd 100755 --- a/TAO/tests/Bug_3553_Regression/run_test.pl +++ b/TAO/tests/Bug_3553_Regression/run_test.pl @@ -32,9 +32,9 @@ my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 fail my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$SV = $server->CreateProcess ("server", +$SV = $server->CreateProcess ("server", "-c $cache_size -ORBdebuglevel $debug_level -ORBListenEndpoints iiop://localhost:$port"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-c $cache_size -p $port -ORBdebuglevel $debug_level"); $server_status = $SV->Spawn (); diff --git a/TAO/tests/Bug_3647_Regression/Test.idl b/TAO/tests/Bug_3647_Regression/Test.idl index e8fc5efdfdf..3aeaab4f7fb 100644 --- a/TAO/tests/Bug_3647_Regression/Test.idl +++ b/TAO/tests/Bug_3647_Regression/Test.idl @@ -14,7 +14,7 @@ module Bug_3647_Regression { typedef sequence<octet> Payload; - + interface Backend { /// This operation is called during the startup, to make sure all diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index bb3b4ff2bb5..017178ba04a 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -16,7 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ami_test_i.h" -#include "tao/ORB_Core.h" +#include "tao/ORB_Core.h" const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); int nthreads = 1; @@ -81,7 +81,7 @@ public: /// The thread entry point. virtual int svc (void); - + /// Set all members to nil void clear (); @@ -102,7 +102,7 @@ public: Handler (void) { }; - + void foo (CORBA::Long result, CORBA::Long out_l) { @@ -253,7 +253,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->destroy (); CORBA::ULong ref_count = orb->_refcount(); - + if (ref_count > 1) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Refcount orb %d\n"), ref_count)); @@ -274,7 +274,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ex._tao_print_exception ("Caught exception:"); return 1; - + } return parameter_corruption; diff --git a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp index 2d6e49eb0af..3d1ee4218f5 100644 --- a/TAO/tests/Bug_3695_Regression/Bug_3695.cpp +++ b/TAO/tests/Bug_3695_Regression/Bug_3695.cpp @@ -18,7 +18,7 @@ struct IIOP_Profile_var explicit IIOP_Profile_var (TAO_IIOP_Profile *pro) : pro_ (pro) {} - + ~IIOP_Profile_var () { this->pro_->_decr_refcnt (); diff --git a/TAO/tests/Bug_3746_Regression/Test.idl b/TAO/tests/Bug_3746_Regression/Test.idl index df0af811264..c566d5e04e0 100644 --- a/TAO/tests/Bug_3746_Regression/Test.idl +++ b/TAO/tests/Bug_3746_Regression/Test.idl @@ -9,7 +9,7 @@ module Test interface BoundSequences { typedef sequence<long, 10> SequenceOf10Long; - unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq); + unsigned long SendSequenceOf10Long (in unsigned long LengthSent, in SequenceOf10Long inSeq); /// A method to shutdown the ORB /** diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp index 918bf39de15..9042e5fc0ed 100644 --- a/TAO/tests/Bug_3766_Regression/TestI.cpp +++ b/TAO/tests/Bug_3766_Regression/TestI.cpp @@ -27,7 +27,7 @@ * http://www.cs.wustl.edu/~schmidt/TAO.html **/ -// TAO_IDL - Generated from +// TAO_IDL - Generated from // .\be\be_codegen.cpp:1422 #include "TestI.h" diff --git a/TAO/tests/Bug_3801_Regression/ami_test.idl b/TAO/tests/Bug_3801_Regression/ami_test.idl index be446bc290b..9b24ec68d59 100644 --- a/TAO/tests/Bug_3801_Regression/ami_test.idl +++ b/TAO/tests/Bug_3801_Regression/ami_test.idl @@ -36,7 +36,7 @@ module A raises (DidTheRightThing); oneway void shutdown (); - + void inout_arg_test (inout string str); }; }; diff --git a/TAO/tests/Bug_3853_Regression/Hello.idl b/TAO/tests/Bug_3853_Regression/Hello.idl index 13926dd3d61..b707d501a1a 100644 --- a/TAO/tests/Bug_3853_Regression/Hello.idl +++ b/TAO/tests/Bug_3853_Regression/Hello.idl @@ -3,7 +3,7 @@ // module Demo { - interface HelloWorld + interface HelloWorld { void sayHello(in string msg); oneway void shutdown(); diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp index e49956f89e4..478a4fc6902 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp +++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp @@ -14,7 +14,7 @@ Demo_HelloWorld_i::~Demo_HelloWorld_i (void) { } -void Demo_HelloWorld_i::sayHello ( +void Demo_HelloWorld_i::sayHello ( const char * msg ) { diff --git a/TAO/tests/Bug_3853_Regression/run_test.pl b/TAO/tests/Bug_3853_Regression/run_test.pl index 6616f62667f..332df733501 100755 --- a/TAO/tests/Bug_3853_Regression/run_test.pl +++ b/TAO/tests/Bug_3853_Regression/run_test.pl @@ -105,7 +105,7 @@ if ($server_status != 0) { $CL->Kill (); $CL->TimedWait (1); exit 1; } - + $server_status = $SV1->Spawn (); if ($server_status != 0) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp index 456d7025478..8e39e223b45 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp @@ -8,7 +8,7 @@ void swap ( CORBA::Long& x, CORBA::Long& y ) temp = x; x = y; y = temp; -} +} void sort ( LongVector & vector ) diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp index 1ef8ce83cd7..82cb6b65221 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp @@ -63,9 +63,9 @@ Foo_A_Statistics::actual_vs_expected() continue; } - unsigned actual_size + unsigned actual_size = this->actual_in_values_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_clients_ * stats.expected_[i]; if (actual_size != expected_size) { @@ -80,7 +80,7 @@ Foo_A_Statistics::actual_vs_expected() return false; } } - } + } return true; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl index 49be42260cb..717d74adea5 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl @@ -2,7 +2,7 @@ #ifndef CALLBACK_IDL #define CALLBACK_IDL -interface Callback +interface Callback { void test_method(); }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl index 01e5ddb5179..949f08397ad 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl @@ -4,7 +4,7 @@ #include "FooException.idl" #include "Callback.idl" - + typedef sequence<char, 32> Bounded_Var_Size; typedef sequence<char> Unbounded_Var_Size; @@ -17,7 +17,7 @@ struct TimeOfDay { short minute; // 0 - 59 short second; // 0 - 59 }; -interface Foo_B +interface Foo_B { /// void return-type, no arguments void op1(); @@ -39,7 +39,7 @@ interface Foo_B inout string message); /// Callback test. - + /// Pass the callback object and the server invoke operation on /// the callback object reference. void op7 (in Callback cb) raises (FooException); @@ -51,7 +51,7 @@ interface Foo_B oneway void test_fixed_array_arg(in Fixed_Array message); oneway void test_var_array_arg(in Var_Array messages); - + oneway void test_bounded_var_size_arg(in Bounded_Var_Size message); oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp index b832e29d9a1..b6155743e3b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp @@ -3,7 +3,7 @@ #include "Foo_C_ClientEngine.h" #include "Foo_C_Custom_ClientEngine.h" -Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, +Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, unsigned num_collocated_clients) : num_remote_clients_ (num_remote_clients), num_collocated_clients_ (num_collocated_clients) @@ -71,21 +71,21 @@ Foo_C_Statistics::actual_vs_expected() } // Verify the "in" values. - // Skip op1/op5 and cust_op1/cust_op5 since they do not have + // Skip op1/op5 and cust_op1/cust_op5 since they do not have // any "in" values. if (i % 5 == 0 || i % 5 == 4) { continue; } - unsigned actual_size + unsigned actual_size = this->actual_in_values_[i].size (); - unsigned expected_size + unsigned expected_size = this->num_remote_clients_ * remote_client_stats.expected_[i] + this->num_collocated_clients_ * collocated_client_stats.expected_[i]; - + if (actual_size == 0 && expected_size == 0) - { + { continue; } @@ -103,7 +103,7 @@ Foo_C_Statistics::actual_vs_expected() return false; } } - } + } return true; } diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp index 63fd91f1acb..d0383fbae43 100644 --- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp @@ -276,7 +276,7 @@ UTF16_UCS2_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/tests/DII_Collocation_Tests/oneway/Test.idl b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl index a38d373dfbe..e3e8a70dc4d 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Test.idl +++ b/TAO/tests/DII_Collocation_Tests/oneway/Test.idl @@ -53,16 +53,16 @@ module Test oneway void test_object_arg (in Object o); - oneway void test_args_1 (in Object arg1, - in char arg2, + oneway void test_args_1 (in Object arg1, + in char arg2, in Simple_Test arg3); - oneway void test_args_2 (in string arg1, - in Fixed_Array arg2, + oneway void test_args_2 (in string arg1, + in Fixed_Array arg2, in TimeOfDay arg3); oneway void test_args_3 (in Bounded_String arg1, - in Bounded_Var_Size_Arg arg2, + in Bounded_Var_Size_Arg arg2, in Unbounded_Var_Size_Arg arg3, in Var_Array arg4); diff --git a/TAO/tests/DSI_AMH/Test.idl b/TAO/tests/DSI_AMH/Test.idl index fb38537f0b7..057177a145b 100644 --- a/TAO/tests/DSI_AMH/Test.idl +++ b/TAO/tests/DSI_AMH/Test.idl @@ -9,7 +9,7 @@ module Test interface Roundtrip { - /// The operation simply returns its argument. + /// The operation simply returns its argument. Timestamp test_method (in Timestamp send_time); /// Shutdown the ORB diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index 321efcf4f22..e54d076e045 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -36,8 +36,8 @@ Data::Data (CORBA::ORB_var orb) m_wchar1 (666), m_wchar2 (0), orb_ (orb) { - ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888); - ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999); + ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble1, 88888888888.8888); + ACE_CDR_LONG_DOUBLE_ASSIGNMENT (m_longdouble2, 99999999999.9999); try { diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index dfbe9bbcf9f..548e6847c0e 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -364,7 +364,7 @@ Test_DynStruct::run_test (void) corba_long_double <<= l_long_double_in_struct; DynamicAny::DynAny_var l_dynany = dynany_factory->create_dyn_any (corba_long_double); - try + try { l_dynany->destroy (); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/File_IO/run_test.pl b/TAO/tests/File_IO/run_test.pl index 7f03bd227fa..61749665a3f 100755 --- a/TAO/tests/File_IO/run_test.pl +++ b/TAO/tests/File_IO/run_test.pl @@ -15,10 +15,10 @@ $client_debug_level = '0'; foreach $i (@ARGV) { if ($i eq '-sdebug') { $server_debug_level = '10'; - } + } if ($i eq '-cdebug') { $client_debug_level = '10'; - } + } } diff --git a/TAO/tests/ForwardOnceUponException/run_test.pl b/TAO/tests/ForwardOnceUponException/run_test.pl index 0271ba7cbaf..cf934765749 100755 --- a/TAO/tests/ForwardOnceUponException/run_test.pl +++ b/TAO/tests/ForwardOnceUponException/run_test.pl @@ -18,74 +18,74 @@ foreach $i (@ARGV) { } # Current supported forward once exceptions: -# EF_OBJECT_NOT_EXIST = 0x1, -# EF_COMM_FAILURE = 0x2, -# EF_TRANSIENT = 0x4, -# EF_INV_OBJREF = 0x8, +# EF_OBJECT_NOT_EXIST = 0x1, +# EF_COMM_FAILURE = 0x2, +# EF_TRANSIENT = 0x4, +# EF_INV_OBJREF = 0x8, @configurations = ({ - description => "case 1: not forward upon OBJECT_NOT_EXIST exception", + description => "case 1: not forward upon OBJECT_NOT_EXIST exception", orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 0", num_requests => "1", client_expect_num_ex => "1", - client_expect_ex_kind => "1", - server_raise_ex_kind => "1", + client_expect_ex_kind => "1", + server_raise_ex_kind => "1", servant_calls => "1", },{ - description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception", + description => "case 2: default Fault Tolerant always forward upon COMM_FAILURE exception", orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 0", num_requests => "1", client_expect_num_ex => "0", - client_expect_ex_kind => "0", - server_raise_ex_kind => "2", + client_expect_ex_kind => "0", + server_raise_ex_kind => "2", servant_calls => "0", # use 0 to indicate request looping case },{ - description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception", + description => "case 3: default Fault Tolerant always forward upon TRANSIENT exception", orb_exception_forward_opt => "-ORBForwardOnceOnTransient 0", num_requests => "1", client_expect_num_ex => "0", - client_expect_ex_kind => "0", - server_raise_ex_kind => "4", + client_expect_ex_kind => "0", + server_raise_ex_kind => "4", servant_calls => "0", # use 0 to indicate request looping case },{ - description => "case 4: not forward upon INV_OBJREF exception", + description => "case 4: not forward upon INV_OBJREF exception", orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 0", num_requests => "1", - client_expect_num_ex => "1", - client_expect_ex_kind => "8", - server_raise_ex_kind => "8", + client_expect_num_ex => "1", + client_expect_ex_kind => "8", + server_raise_ex_kind => "8", servant_calls => "1", },{ - description => "case 5: forward once upon OBJECT_NOT_EXIST exception", + description => "case 5: forward once upon OBJECT_NOT_EXIST exception", orb_exception_forward_opt => "-ORBForwardOnceOnObjectNotExist 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "1", - server_raise_ex_kind => "1", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "1", + server_raise_ex_kind => "1", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 6: forward once upon COMM_FAILURE exception", + description => "case 6: forward once upon COMM_FAILURE exception", orb_exception_forward_opt => "-ORBForwardOnceOnCommFailure 1", - num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "2", - server_raise_ex_kind => "2", - servant_calls => "5", # 4 requests + 1 forward + num_requests => "4", + client_expect_num_ex => "4", + client_expect_ex_kind => "2", + server_raise_ex_kind => "2", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 7: forward once upon TRANSIENT exception", + description => "case 7: forward once upon TRANSIENT exception", orb_exception_forward_opt => "-ORBForwardOnceOnTransient 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "4", - server_raise_ex_kind => "4", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "4", + server_raise_ex_kind => "4", + servant_calls => "5", # 4 requests + 1 forward },{ - description => "case 8: forward once upon INV_OBJREF exception", + description => "case 8: forward once upon INV_OBJREF exception", orb_exception_forward_opt => "-ORBForwardOnceOnInvObjref 1", num_requests => "4", - client_expect_num_ex => "4", - client_expect_ex_kind => "8", - server_raise_ex_kind => "8", - servant_calls => "5", # 4 requests + 1 forward + client_expect_num_ex => "4", + client_expect_ex_kind => "8", + server_raise_ex_kind => "8", + servant_calls => "5", # 4 requests + 1 forward }, ); @@ -114,7 +114,7 @@ for $test (@configurations) { "-e $test->{client_expect_ex_kind} " . "-n $test->{client_expect_num_ex} ". "-i $test->{num_requests} $test->{orb_exception_forward_opt}"); - + print STDERR $SV->CommandLine () . "\n"; print STDERR $CL->CommandLine () . "\n"; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/server.java b/TAO/tests/GIOP_Fragments/Java_Big_Reply/server.java index f23d552c542..c89b7595e7f 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/server.java +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/server.java @@ -59,4 +59,4 @@ public class server e.printStackTrace (System.out); } } -} +} diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl index 26a561aa58b..3e10a136d4d 100755 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/dribble.pl @@ -53,7 +53,7 @@ if (!$result) { my($initial) = length($str); my($length) = $initial; my($maxLine) = 78; - + print $str; foreach my $key (sort keys %options) { diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl b/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl index b8d54bafcb2..b24866358c6 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.idl @@ -13,9 +13,9 @@ module Outer }; }; }; - + module Outer -{ +{ module Inner { interface Base; diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp index d7727558b6a..1fdf64ad83d 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ #include "InheritedOp_i.h" diff --git a/TAO/tests/IDL_Test/anonymous.idl b/TAO/tests/IDL_Test/anonymous.idl index f3eeb99b731..1e18057358f 100644 --- a/TAO/tests/IDL_Test/anonymous.idl +++ b/TAO/tests/IDL_Test/anonymous.idl @@ -9,7 +9,7 @@ // anonymous.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -55,7 +55,7 @@ module All_Anon }; // Neither array nor sequence are typedef'd. - exception Nested_Anon + exception Nested_Anon { sequence<float> float_seq_array[6]; sequence<float> another_fsa[6]; diff --git a/TAO/tests/IDL_Test/array_only.idl b/TAO/tests/IDL_Test/array_only.idl index bb791128223..e8052ce55d8 100644 --- a/TAO/tests/IDL_Test/array_only.idl +++ b/TAO/tests/IDL_Test/array_only.idl @@ -9,7 +9,7 @@ // array_only.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. diff --git a/TAO/tests/IDL_Test/dif2.idl b/TAO/tests/IDL_Test/dif2.idl index 5f605c3b16d..0d14a70d0c5 100644 --- a/TAO/tests/IDL_Test/dif2.idl +++ b/TAO/tests/IDL_Test/dif2.idl @@ -21,83 +21,83 @@ module OldDif2 interface ex1 { void op0 (); - + float op1 (in float f, out double d, inout long l); - + double op2 (in double d, out long l, inout short s); - + long op3 (in long l, out short s, inout unsigned long ul); - + short op4 (in short s, out unsigned long ul, inout unsigned short us); - + unsigned long op5 (inout unsigned long ul, in unsigned short us, out char c, in boolean b); - + unsigned short op6 (out unsigned short us, inout char c); }; - interface ex2 : ex1 + interface ex2 : ex1 { // Operations continued from ex1. char op7 (in char c, out boolean b, inout octet o); - + boolean op8 (out boolean b, in octet o); - + octet op9 (inout octet o, out string s, in string <10> ls, inout long l); - + string op10 (in string s, out string <10> ls); - + string <10> op11 (inout string <10> ls, out long l); - + long op12 (in long l); }; interface ex3 : ex1 { readonly attribute float float_attribute; - + attribute double double_attribute; - + readonly attribute long long_attribute; - + attribute short short_attribute; - + readonly attribute unsigned long unsigned_long_attribute; }; interface ex4 : ex2, ex3 { attribute unsigned short unsigned_short_attribute; - + readonly attribute char char_attribute; - + attribute boolean boolean_attribute; - + readonly attribute octet octet_attribute; - + attribute string string_attribute; - + readonly attribute string <10> limited_string_attribute; - + readonly attribute ex4 an_object_attribute; }; }; diff --git a/TAO/tests/IDL_Test/enum_in_struct.idl b/TAO/tests/IDL_Test/enum_in_struct.idl index d3c41ce7781..0f9ace32f82 100644 --- a/TAO/tests/IDL_Test/enum_in_struct.idl +++ b/TAO/tests/IDL_Test/enum_in_struct.idl @@ -9,7 +9,7 @@ // enum_in_struct.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -31,11 +31,11 @@ enum UnNamed struct HoldsEnum { - enum Named - { - NAMED_FIRST, - NAMED_SECOND, - NAMED_THIRD + enum Named + { + NAMED_FIRST, + NAMED_SECOND, + NAMED_THIRD } named_enum; UnNamed unnamed_enum; @@ -45,22 +45,22 @@ struct HoldsEnum struct decl_heavy_struct { - enum str_en + enum str_en { - a, - b, + a, + b, c } m_en[10]; - struct st + struct st { - long a; + long a; char b; } m_st[10]; - union un switch (long) + union un switch (long) { - case 1: long a; + case 1: long a; case 2: char b; } m_un[10]; }; diff --git a/TAO/tests/IDL_Test/full.idl b/TAO/tests/IDL_Test/full.idl index 6df0fdc4383..f5824e1874f 100644 --- a/TAO/tests/IDL_Test/full.idl +++ b/TAO/tests/IDL_Test/full.idl @@ -9,7 +9,7 @@ // full.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -23,7 +23,7 @@ // handling of forward interface declarations that are // not defined in the same IDL file. The two files have // mutually dependent interfaces. It is no longer necessary -// for such ILD files to include each other, as long as +// for such ILD files to include each other, as long as // they are part of the same build. module scope_test @@ -36,7 +36,7 @@ module mod2 interface fwd; interface full; - interface fwd + interface fwd { attribute string attr; diff --git a/TAO/tests/IDL_Test/fwd.idl b/TAO/tests/IDL_Test/fwd.idl index ddfb13adde0..8aa28ad4e4d 100644 --- a/TAO/tests/IDL_Test/fwd.idl +++ b/TAO/tests/IDL_Test/fwd.idl @@ -9,7 +9,7 @@ // fwd.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -23,7 +23,7 @@ // handling of forward interface declarations that are // not defined in the same IDL file. The two files have // mutually dependent interfaces. It is no longer necessary -// for such ILD files to include each other, as long as +// for such ILD files to include each other, as long as // they are part of the same build. module scope_test @@ -47,14 +47,14 @@ module mod2 }; interface fwd; - + exception exp { fwd fwd_mem; }; - + typedef fwd td_fwd; - + interface full { fwd op (in fwd inarg, @@ -74,11 +74,11 @@ module mod2 module fwd_mixed_intf { interface mixed_parents; - + interface concrete_parent {}; - + abstract interface abstract_parent {}; - + interface mixed_abs_first : abstract_parent, concrete_parent {}; interface mixed_conc_first : concrete_parent, abstract_parent {}; }; diff --git a/TAO/tests/IDL_Test/generic_object.idl b/TAO/tests/IDL_Test/generic_object.idl index d0a21cdec0e..6186e8fdcbc 100644 --- a/TAO/tests/IDL_Test/generic_object.idl +++ b/TAO/tests/IDL_Test/generic_object.idl @@ -9,7 +9,7 @@ // generic_object.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -22,13 +22,13 @@ // The IDL compiler deals with these in a completely different way // that it deals with a derived object, i.e., an interface. -enum ObjectType +enum ObjectType { - OT_THIS, + OT_THIS, OT_THAT }; -union Selecter switch (ObjectType) +union Selecter switch (ObjectType) { case OT_THIS: Object this_object; case OT_THAT: Object that_object; @@ -37,8 +37,8 @@ union Selecter switch (ObjectType) // Test stub code for generic object parameters. interface generic { - Object op (in Object inarg, - inout Object inoutarg, + Object op (in Object inarg, + inout Object inoutarg, out Object outarg); }; diff --git a/TAO/tests/IDL_Test/gperf.idl b/TAO/tests/IDL_Test/gperf.idl index a26cb9f9f33..627c472d987 100644 --- a/TAO/tests/IDL_Test/gperf.idl +++ b/TAO/tests/IDL_Test/gperf.idl @@ -9,7 +9,7 @@ // gperf.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -67,7 +67,7 @@ interface test attribute testlistitem tltest; testlistitem new_testlistitem (in string name); -}; +}; interface Simple_Server { @@ -94,5 +94,5 @@ interface Simple_Server oneway void transferTriggerDb (); oneway void transferTriggerTdc (); }; - + diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl index d5e713d6e44..224ab773795 100644 --- a/TAO/tests/IDL_Test/interface.idl +++ b/TAO/tests/IDL_Test/interface.idl @@ -218,12 +218,12 @@ module redefs interface base { const long lconst = -5; - + exception ex { string info; }; - + struct foo { short index; @@ -233,12 +233,12 @@ module redefs interface derived : base { const long lconst = 44; - + exception ex { long serial; }; - + struct foo { string str; diff --git a/TAO/tests/IDL_Test/invalid_scoping.idl b/TAO/tests/IDL_Test/invalid_scoping.idl index 37708f6c647..dbf3a1aa956 100644 --- a/TAO/tests/IDL_Test/invalid_scoping.idl +++ b/TAO/tests/IDL_Test/invalid_scoping.idl @@ -9,7 +9,7 @@ // invalid_scoping.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. diff --git a/TAO/tests/IDL_Test/keywords.idl b/TAO/tests/IDL_Test/keywords.idl index f09b93ed87b..ae870d11bbe 100644 --- a/TAO/tests/IDL_Test/keywords.idl +++ b/TAO/tests/IDL_Test/keywords.idl @@ -9,7 +9,7 @@ // keywords.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp index 91bebd23bd6..965dc0981f1 100644 --- a/TAO/tests/IDL_Test/main.cpp +++ b/TAO/tests/IDL_Test/main.cpp @@ -88,10 +88,10 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { int error_count = 0; - + const ACE_CDR::ULongLong test_ull = ACE_UINT64_LITERAL (122192928000000000); - + if (test_ull != AAA) { ++error_count; @@ -100,7 +100,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long AAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + const CORBA::LongLong test_nll = ACE_INT64_LITERAL (-122192928000000000); if (test_nll != NAAA) @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long NAAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + const CORBA::LongLong test_pll = ACE_INT64_LITERAL (122192928000000000); if (test_pll != PAAA) @@ -122,7 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_TEXT (" long long PAAA in constants.idl") ACE_TEXT (" is incorrect\n"))); } - + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, diff --git a/TAO/tests/IDL_Test/old_array.idl b/TAO/tests/IDL_Test/old_array.idl index fdd9b264bf7..33e36c7843e 100644 --- a/TAO/tests/IDL_Test/old_array.idl +++ b/TAO/tests/IDL_Test/old_array.idl @@ -54,15 +54,15 @@ module OldArray A op (in A a1, inout A a2, out A a3); - + str22 op2 (in str22 a1, inout str22 a2, out str22 a3); - + A_matrix op4 (in A a1, inout A a2, out A a3); - + attribute str22 attribute_array; }; }; diff --git a/TAO/tests/IDL_Test/old_constants.idl b/TAO/tests/IDL_Test/old_constants.idl index 6c8a8cc8301..460373e9883 100644 --- a/TAO/tests/IDL_Test/old_constants.idl +++ b/TAO/tests/IDL_Test/old_constants.idl @@ -35,7 +35,7 @@ module OldConstants module M { - const short l = 4; + const short l = 4; enum N { @@ -52,8 +52,8 @@ module OldConstants interface A { - const short l = 4; - + const short l = 4; + enum N { zero, @@ -61,7 +61,7 @@ module OldConstants deux, trois }; - + exception E { short cause ; diff --git a/TAO/tests/IDL_Test/old_struct.idl b/TAO/tests/IDL_Test/old_struct.idl index 424c5e5b958..ad0bb3bc83a 100644 --- a/TAO/tests/IDL_Test/old_struct.idl +++ b/TAO/tests/IDL_Test/old_struct.idl @@ -54,7 +54,7 @@ interface foo1 interface foo2 : foo1 { bar1 op2 (in bar2 a); - + long op3 (in long a, out char b); }; diff --git a/TAO/tests/IDL_Test/params.idl b/TAO/tests/IDL_Test/params.idl index 950c5472060..367ab99723c 100644 --- a/TAO/tests/IDL_Test/params.idl +++ b/TAO/tests/IDL_Test/params.idl @@ -9,7 +9,7 @@ // params.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -24,23 +24,23 @@ // more judiciously in the header file. This file was // also initially a problem for lookups as well. -module foo +module foo { - struct theDate + struct theDate { short year; short month; short day; }; - - module bar + + module bar { - struct theDate + struct theDate { short x; }; - - interface fooBar + + interface fooBar { foo::theDate getDate (in foo::theDate a, inout foo::theDate b, diff --git a/TAO/tests/IDL_Test/primtypes.idl b/TAO/tests/IDL_Test/primtypes.idl index 12b2a2c2324..18ebba19b50 100644 --- a/TAO/tests/IDL_Test/primtypes.idl +++ b/TAO/tests/IDL_Test/primtypes.idl @@ -21,9 +21,9 @@ module OldPrimTypes interface ex1 { attribute long l1; - + long m1 (in long a); - + ex1 mtypes (in long a1, inout long a2, out long a3, @@ -47,7 +47,7 @@ module OldPrimTypes out char g3); }; - interface ex2 : ex1 + interface ex2 : ex1 { readonly attribute long l2; diff --git a/TAO/tests/IDL_Test/reopen_include1.idl b/TAO/tests/IDL_Test/reopen_include1.idl index a0770bcc4de..a66fdd4e37a 100644 --- a/TAO/tests/IDL_Test/reopen_include1.idl +++ b/TAO/tests/IDL_Test/reopen_include1.idl @@ -9,7 +9,7 @@ // reopen_include1.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -24,7 +24,7 @@ // First opening of a module included by a chain of // inclusions into reopened_modules.idl -module frag +module frag { typedef sequence<double> dub_seq; }; diff --git a/TAO/tests/IDL_Test/reopen_include2.idl b/TAO/tests/IDL_Test/reopen_include2.idl index 19db6d6ff3a..2059b6b9d71 100644 --- a/TAO/tests/IDL_Test/reopen_include2.idl +++ b/TAO/tests/IDL_Test/reopen_include2.idl @@ -9,7 +9,7 @@ // reopen_include2.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -32,7 +32,7 @@ module frag }; // These three are reopened in reopened_modules.idl. -module XX +module XX { typedef long whah; }; diff --git a/TAO/tests/IDL_Test/reopened_modules.idl b/TAO/tests/IDL_Test/reopened_modules.idl index b92d6e8a131..1a748b2565d 100644 --- a/TAO/tests/IDL_Test/reopened_modules.idl +++ b/TAO/tests/IDL_Test/reopened_modules.idl @@ -9,7 +9,7 @@ // reopened_modules.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -40,7 +40,7 @@ module AA { module CC { - interface x2 + interface x2 { // 'AA::BB::' should be implicit void op1 (in x1 obj); @@ -57,19 +57,19 @@ module AA // recognized as being in the same scope as the // previous occurrence(s). -module dot -{ +module dot +{ interface Party; - interface Person + interface Person { attribute Party someParty; }; }; -module dot -{ - interface Party +module dot +{ + interface Party { attribute Person somePerson; }; @@ -102,18 +102,18 @@ interface OpHolder // This particular combination used to cause IDL compiler // to go into an infinite loop looking for return type to -// getInfo(). Partial solution got rid of infinite loop, +// getInfo(). Partial solution got rid of infinite loop, // but erroneously returned ::com from lookup. -module com +module com { - module mr + module mr { typedef short info; }; }; -module com +module com { interface IFace { @@ -124,7 +124,7 @@ module com // Modules X and Y are also included from reopene_include2.idl. // There were problems with the lookup of Y::Z and X::Ex. -module Y +module Y { interface Z {}; }; @@ -133,7 +133,7 @@ module X { exception Ex {}; - interface BI : Y::Z + interface BI : Y::Z { void method () raises (X::Ex); }; @@ -142,16 +142,16 @@ module X // Reopened from reopen_include2.idl inclusion. There // was a problem with the inheritance lookup. -module XX +module XX { interface blah_intfc; - interface blah_intfc + interface blah_intfc { void op1 (); }; - interface blah0 : blah_intfc + interface blah0 : blah_intfc { void op0 (); }; @@ -249,7 +249,7 @@ module mC }; // The example below uncovered errors in the logic of -// AST_Module::fe_add_interface_fwd() and +// AST_Module::fe_add_interface_fwd() and // AST_Module::add_to_previous() that were causing // AST_Module::look_in_previous() (and thus lookup_by_name) // to fail on the last line. @@ -284,7 +284,7 @@ module Schmoik module Thwoik { interface TestType; -}; +}; module Thwoik { @@ -298,7 +298,7 @@ module Thwoik }; // We had a problem with the inheritance list -// in the declaration of A_mod::B_mod::Foo, in +// in the declaration of A_mod::B_mod::Foo, in // both stub and skeleton files. module A_mod { @@ -307,12 +307,12 @@ module A_mod module B_mod { interface Foo : A_mod::Foo {}; - }; + }; }; /// Similar to example at the top of this file, /// but with more openings and deeper nesting. -module m1 +module m1 { module m2 { diff --git a/TAO/tests/IDL_Test/repo_id_mod.idl b/TAO/tests/IDL_Test/repo_id_mod.idl index 51f50178384..6f4eee62c93 100644 --- a/TAO/tests/IDL_Test/repo_id_mod.idl +++ b/TAO/tests/IDL_Test/repo_id_mod.idl @@ -9,7 +9,7 @@ // repo_id_mod.idl // // = DESCRIPTION -// This file contains examples of IDL code that has +// This file contains examples of IDL code that has // caused problems in the past for the TAO IDL // compiler. This test is to make sure the problems // stay fixed. @@ -59,7 +59,7 @@ module gleep // This will override the prefix directive for module floop at the end // of the file. typeprefix floop::verklempt "verklempt_prefix"; - }; + }; }; local interface schmegegging {}; diff --git a/TAO/tests/IDL_Test/simple.idl b/TAO/tests/IDL_Test/simple.idl index f12b4c92458..4b71ba2d0bb 100644 --- a/TAO/tests/IDL_Test/simple.idl +++ b/TAO/tests/IDL_Test/simple.idl @@ -37,7 +37,7 @@ interface simple2 : simple { long reason2; }; - + long op2 (in long a, in simple b, out simple2 c) diff --git a/TAO/tests/IDL_Test/simple2.idl b/TAO/tests/IDL_Test/simple2.idl index afad6e2e0e1..c5246d1c6dc 100644 --- a/TAO/tests/IDL_Test/simple2.idl +++ b/TAO/tests/IDL_Test/simple2.idl @@ -38,7 +38,7 @@ interface simple3 : simple2 }; exception UserError - { + { any reason; }; diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl index 41ef604cd3c..1efccc9d622 100644 --- a/TAO/tests/IDL_Test/valuetype.idl +++ b/TAO/tests/IDL_Test/valuetype.idl @@ -70,7 +70,7 @@ module X Object make_object (); }; - abstract valuetype BXXX : AXXX + abstract valuetype BXXX : AXXX { }; typedef sequence<BXXX> BSeq; diff --git a/TAO/tests/IORManipulation/filter/run_test.pl b/TAO/tests/IORManipulation/filter/run_test.pl index 6063a25b8e1..11dff36ee06 100755 --- a/TAO/tests/IORManipulation/filter/run_test.pl +++ b/TAO/tests/IORManipulation/filter/run_test.pl @@ -26,7 +26,7 @@ $SV = $server->CreateProcess ("server", "-ORBUseSharedProfiles 0 " . "-ORBEndpoint iiop://localhost " . "-ORBEndpoint iiop://$hostname"); - + $server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); if ($server_status != 0) { diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl index cbb8054de28..1c92c90a571 100644 --- a/TAO/tests/MT_Client/test.idl +++ b/TAO/tests/MT_Client/test.idl @@ -11,7 +11,7 @@ interface Simple_Server /// Shutdown the server /** - * Provide a simple way to cleanup the test when it finishes + * Provide a simple way to cleanup the test when it finishes */ oneway void shutdown (); }; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl index f93b53177b9..3bdfd45516e 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.idl @@ -26,7 +26,7 @@ interface Object_A { interface MT_Object; -interface MT_Object +interface MT_Object { long yadda (in long hop_count, in MT_Object partner); }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl index 485d1f0edc5..a99b5829bcc 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl +++ b/TAO/tests/NestedUpcall/Triangle_Test/Triangle_Test.idl @@ -26,7 +26,7 @@ interface Initiator { interface Object_A { void foo (in Initiator theInitiator); - + oneway void finish (); }; diff --git a/TAO/tests/No_Server_MT_Connect_Test/test.idl b/TAO/tests/No_Server_MT_Connect_Test/test.idl index cbb8054de28..1c92c90a571 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test.idl +++ b/TAO/tests/No_Server_MT_Connect_Test/test.idl @@ -11,7 +11,7 @@ interface Simple_Server /// Shutdown the server /** - * Provide a simple way to cleanup the test when it finishes + * Provide a simple way to cleanup the test when it finishes */ oneway void shutdown (); }; diff --git a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl index 662c919aea5..b350133f8ea 100644 --- a/TAO/tests/OBV/Collocated/Forward/TreeBase.idl +++ b/TAO/tests/OBV/Collocated/Forward/TreeBase.idl @@ -6,8 +6,8 @@ valuetype BaseNode; //@@ Dosn't work for now //typedef sequence<BaseNode> BaseNodeSeq; -// Performance test: One may try to pass -// over the wire a cyclic graph and measure +// Performance test: One may try to pass +// over the wire a cyclic graph and measure // how quickly TAO evaporates memory ;-) valuetype BaseNode diff --git a/TAO/tests/OBV/Collocated/Forward/TreeController.idl b/TAO/tests/OBV/Collocated/Forward/TreeController.idl index 4a9705db918..11665da53fe 100644 --- a/TAO/tests/OBV/Collocated/Forward/TreeController.idl +++ b/TAO/tests/OBV/Collocated/Forward/TreeController.idl @@ -2,8 +2,8 @@ valuetype BaseNode; -// This TreeController is probably a silly idea. -// All I want from it is a valutype forward declared +// This TreeController is probably a silly idea. +// All I want from it is a valutype forward declared // in one file and fully defined in another. valuetype TreeController @@ -15,7 +15,7 @@ interface Test { // Returnes the reflected copy of its argument. TreeController reflect (in TreeController tc); - + // Shutdown the romote ORB oneway void shutdown (); }; diff --git a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl index 06010fd7b18..f37c1639395 100644 --- a/TAO/tests/OBV/Collocated/Forward/TreeNode.idl +++ b/TAO/tests/OBV/Collocated/Forward/TreeNode.idl @@ -5,7 +5,7 @@ // // A concrete node type // -valuetype StringNode : BaseNode +valuetype StringNode : BaseNode { public string name; }; diff --git a/TAO/tests/OBV/Factory/Factory.idl b/TAO/tests/OBV/Factory/Factory.idl index f6fd41a6ab7..43ce343697a 100644 --- a/TAO/tests/OBV/Factory/Factory.idl +++ b/TAO/tests/OBV/Factory/Factory.idl @@ -10,7 +10,7 @@ module OBV_FactoryTest // // Base valuetype without any ops or factories. Result should be - // concrete BaseConcreteValue_init class ready to use. + // concrete BaseConcreteValue_init class ready to use. // valuetype BaseValue { @@ -19,13 +19,13 @@ module OBV_FactoryTest { unsigned long value; }; - + public unsigned long some_data; }; - + // // Another valuetype w/o ops, etc. Just to check proper inheritance - // of OBV_ classes and RefCounter's. Value1_init should be + // of OBV_ classes and RefCounter's. Value1_init should be // concrete as well. // valuetype Value1 : BaseValue @@ -40,7 +40,7 @@ module OBV_FactoryTest { public unsigned long id; public BV_Data data; - + factory create_default (in unsigned long id); factory create (in unsigned long id, in BV_Data data); @@ -53,7 +53,7 @@ module OBV_FactoryTest { BaseValue get_base_value (); Value1 get_value1 (); - Value2 get_value2 (); + Value2 get_value2 (); // Shutdown the romote ORB oneway void shutdown (); diff --git a/TAO/tests/OBV/Forward/TreeBase.idl b/TAO/tests/OBV/Forward/TreeBase.idl index 662c919aea5..b350133f8ea 100644 --- a/TAO/tests/OBV/Forward/TreeBase.idl +++ b/TAO/tests/OBV/Forward/TreeBase.idl @@ -6,8 +6,8 @@ valuetype BaseNode; //@@ Dosn't work for now //typedef sequence<BaseNode> BaseNodeSeq; -// Performance test: One may try to pass -// over the wire a cyclic graph and measure +// Performance test: One may try to pass +// over the wire a cyclic graph and measure // how quickly TAO evaporates memory ;-) valuetype BaseNode diff --git a/TAO/tests/OBV/Forward/TreeController.idl b/TAO/tests/OBV/Forward/TreeController.idl index 4a9705db918..11665da53fe 100644 --- a/TAO/tests/OBV/Forward/TreeController.idl +++ b/TAO/tests/OBV/Forward/TreeController.idl @@ -2,8 +2,8 @@ valuetype BaseNode; -// This TreeController is probably a silly idea. -// All I want from it is a valutype forward declared +// This TreeController is probably a silly idea. +// All I want from it is a valutype forward declared // in one file and fully defined in another. valuetype TreeController @@ -15,7 +15,7 @@ interface Test { // Returnes the reflected copy of its argument. TreeController reflect (in TreeController tc); - + // Shutdown the romote ORB oneway void shutdown (); }; diff --git a/TAO/tests/OBV/Forward/TreeNode.idl b/TAO/tests/OBV/Forward/TreeNode.idl index 06010fd7b18..f37c1639395 100644 --- a/TAO/tests/OBV/Forward/TreeNode.idl +++ b/TAO/tests/OBV/Forward/TreeNode.idl @@ -5,7 +5,7 @@ // // A concrete node type // -valuetype StringNode : BaseNode +valuetype StringNode : BaseNode { public string name; }; diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp index 68112813009..2269964b8b4 100644 --- a/TAO/tests/OBV/Indirection/MessengerClient.cpp +++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp @@ -37,11 +37,11 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) { bb->b1 (p1); bb->b2 (p1); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two boxed values in one valuetype: %s\n", tst->receive_boxedvalue (b))); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one boxed values twice in one valuetype: %s\n", tst->receive_boxedvalue (bb))); - ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n", + ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing two integers: %s\n", tst->receive_long (p1, p2))); ACE_DEBUG ((LM_DEBUG, "(%P|%t)Passing one integer twice: %s\n", tst->receive_long (p1, p1))); diff --git a/TAO/tests/OBV/Indirection/Messenger_i.cpp b/TAO/tests/OBV/Indirection/Messenger_i.cpp index eccd01852bd..bd845b32e07 100644 --- a/TAO/tests/OBV/Indirection/Messenger_i.cpp +++ b/TAO/tests/OBV/Indirection/Messenger_i.cpp @@ -19,9 +19,9 @@ char * Messenger_i::receive_boxedvalue (::demo::value::idl::boxedValue * b) std::ostringstream os; if (b == 0) os << "null boxed values"; - else + else os << "boxed values: " << b->b1 ()->_value() << ", " << b->b2 ()->_value(); - + return CORBA::string_dup (os.str().c_str()); } @@ -36,7 +36,7 @@ char * Messenger_i::receive_long ( os << "shared long: " << p1->_value (); else os << "two longs: " << p1->_value () << ", " << p2->_value (); - + return CORBA::string_dup (os.str().c_str()); } @@ -71,7 +71,7 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node) if (l[i] == x) break; } - + if (l[i] == x) break; @@ -92,18 +92,18 @@ char * Messenger_i::receive_list (::demo::value::idl::Node * node) return CORBA::string_dup (os.str().c_str()); } -char * +char * Messenger_i::receive_truncatable (::demo::value::idl::TValue *& v) { - v->data (v->data () + 1); - v->basic_data (v->basic_data () + 1); + v->data (v->data () + 1); + v->basic_data (v->basic_data () + 1); std::ostringstream os; os << "truncatable basic_data " << v->basic_data () << " data " << v->data (); return CORBA::string_dup (os.str().c_str()); } -char * +char * Messenger_i::receive_sequence (const ::demo::value::idl::ConfigValues & v) { std::ostringstream os; diff --git a/TAO/tests/OBV/Indirection/run_test.pl b/TAO/tests/OBV/Indirection/run_test.pl index 0808ee9c8d4..8c4a7e550b4 100755 --- a/TAO/tests/OBV/Indirection/run_test.pl +++ b/TAO/tests/OBV/Indirection/run_test.pl @@ -22,24 +22,24 @@ $S->Spawn(); if ($server->WaitForFileTimed ($iorfile, $server->ProcessStartWaitInterval()) == -1) { print STDERR "ERROR: cannot find file <$server_iorfile>\n"; - $S->Kill(); + $S->Kill(); exit 1; } -$C = $client->CreateProcess("MessengerClient"); +$C = $client->CreateProcess("MessengerClient"); $C->Spawn(); $CRET = $C->WaitKill($client->ProcessStartWaitInterval()); $S->Kill(); -# clean-up +# clean-up $server->DeleteFile($iorfile); if ($CRET != 0) { print STDERR "ERROR: Client returned <$CRET>\n"; exit 1 ; -} +} exit 0; diff --git a/TAO/tests/OBV/Supports/Supports_Test.idl b/TAO/tests/OBV/Supports/Supports_Test.idl index e86e3956839..9b60a941d7a 100644 --- a/TAO/tests/OBV/Supports/Supports_Test.idl +++ b/TAO/tests/OBV/Supports/Supports_Test.idl @@ -65,7 +65,7 @@ module Supports_Test long size (); void add_node (in string name); void print (); - + }; valuetype vt_graph supports graph diff --git a/TAO/tests/OBV/ValueBox/valuebox.idl b/TAO/tests/OBV/ValueBox/valuebox.idl index 6af684b75aa..235513c6c55 100644 --- a/TAO/tests/OBV/ValueBox/valuebox.idl +++ b/TAO/tests/OBV/ValueBox/valuebox.idl @@ -38,20 +38,20 @@ interface Test out vb_basic::M_VBlong p3); long basic_op3 (in long p1, inout long p2, out long p3); - + // Boxed string VBstring string_op1(in VBstring p1, inout VBstring p2, out VBstring p3); string string_op2(in string p1, inout string p2, out string p3); - + // Boxed sequence VBseqlong seq_op1(in VBseqlong p1, inout VBseqlong p2, out VBseqlong p3); void seq_op2(in TDseqlong p1, inout TDseqlong p2, out TDseqlong p3); - + // Boxed struct - VBfixed_struct1 struct_op1(in VBfixed_struct1 p1, + VBfixed_struct1 struct_op1(in VBfixed_struct1 p1, inout VBfixed_struct1 p2, out VBfixed_struct1 p3); @@ -59,7 +59,7 @@ interface Test inout Fixed_Struct1 p2, out Fixed_Struct1 p3); - VBvariable_struct1 struct_op3(in VBvariable_struct1 p1, + VBvariable_struct1 struct_op3(in VBvariable_struct1 p1, inout VBvariable_struct1 p2, out VBvariable_struct1 p3); @@ -79,9 +79,9 @@ interface Test void array_op4 (in StringArray p1, inout StringArray p2, out StringArray p3); - + // Boxed union - VBfixed_union1 union_op1(in VBfixed_union1 p1, + VBfixed_union1 union_op1(in VBfixed_union1 p1, inout VBfixed_union1 p2, out VBfixed_union1 p3); @@ -89,14 +89,14 @@ interface Test inout Fixed_Union1 p2, out Fixed_Union1 p3); - VBvariable_union1 union_op3(in VBvariable_union1 p1, + VBvariable_union1 union_op3(in VBvariable_union1 p1, inout VBvariable_union1 p2, out VBvariable_union1 p3); void union_op4(in Variable_Union1 p1, inout Variable_Union1 p2, out Variable_Union1 p3); - + // Shutdown the remote ORB oneway void shutdown (); }; diff --git a/TAO/tests/OBV/ValueBox/vb_basic.idl b/TAO/tests/OBV/ValueBox/vb_basic.idl index 3c4c5f09c54..14d1a9791f7 100644 --- a/TAO/tests/OBV/ValueBox/vb_basic.idl +++ b/TAO/tests/OBV/ValueBox/vb_basic.idl @@ -6,7 +6,7 @@ // Valuebox of all basic types defined at outermost scope: -enum Color { red, orange, yellow, green, blue, indigo, violet }; +enum Color { red, orange, yellow, green, blue, indigo, violet }; valuetype VBshort short; valuetype VBlong long; diff --git a/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl b/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl index ecaa7acd182..ab2a0769b96 100755 --- a/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl +++ b/TAO/tests/Oneways_Invoking_Twoways/run_test_svc.pl @@ -35,7 +35,7 @@ $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", - "-ORBSvcConf $client_conf " . + "-ORBSvcConf $client_conf " . "-k file://$client_iorfile"); $server_status = $SV->Spawn (); diff --git a/TAO/tests/Optimized_Connection/run_test.pl b/TAO/tests/Optimized_Connection/run_test.pl index b79ba666d13..79ad8241918 100755 --- a/TAO/tests/Optimized_Connection/run_test.pl +++ b/TAO/tests/Optimized_Connection/run_test.pl @@ -27,7 +27,7 @@ my $client_conf = $client->LocalFile ("oc_svc.conf"); $CL = $client->CreateProcess ("client", "-k file://$client_iorfile ". "-orbsvcconf $client_conf ". "-ORBDebugLevel $debug_level"); - + if ($client->WaitForFileTimed ($iorbase, $client->ProcessStartWaitInterval()) == -1) { diff --git a/TAO/tests/POA/Loader/run_test.pl b/TAO/tests/POA/Loader/run_test.pl index 0bc52287cac..83dda3bc405 100755 --- a/TAO/tests/POA/Loader/run_test.pl +++ b/TAO/tests/POA/Loader/run_test.pl @@ -18,8 +18,8 @@ $extra_args = ""; $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; - -$server->AddLibPath ('../Generic_Servant/.'); + +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); # Parse the arguments diff --git a/TAO/tests/POA/On_Demand_Activation/run_test.pl b/TAO/tests/POA/On_Demand_Activation/run_test.pl index 2957b71a8bc..454157f91bb 100755 --- a/TAO/tests/POA/On_Demand_Activation/run_test.pl +++ b/TAO/tests/POA/On_Demand_Activation/run_test.pl @@ -13,7 +13,7 @@ $iorbase0 = "ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/TAO/tests/POA/On_Demand_Loading/run_test.pl b/TAO/tests/POA/On_Demand_Loading/run_test.pl index 34ad00d6daa..4127f780899 100755 --- a/TAO/tests/POA/On_Demand_Loading/run_test.pl +++ b/TAO/tests/POA/On_Demand_Loading/run_test.pl @@ -13,7 +13,7 @@ $iorbase0 = "ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/TAO/tests/POA/Reference_Counted_Servant/run_test.pl b/TAO/tests/POA/Reference_Counted_Servant/run_test.pl index c5500e776e9..06f56876a2e 100755 --- a/TAO/tests/POA/Reference_Counted_Servant/run_test.pl +++ b/TAO/tests/POA/Reference_Counted_Servant/run_test.pl @@ -13,7 +13,7 @@ $iorbase = "poa.ior"; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -$server->AddLibPath ('../Generic_Servant/.'); +$server->AddLibPath ('../Generic_Servant/.'); $client->AddLibPath ('../Generic_Servant/.'); $oneway = ""; diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl index 98222150819..599dc801d07 100644 --- a/TAO/tests/Param_Test/param_test.idl +++ b/TAO/tests/Param_Test/param_test.idl @@ -265,7 +265,7 @@ interface Param_Test inout unsigned long s2, out unsigned long s3) raises (Ooops); - + typedef short short_array[32]; union Big_Union switch (short) @@ -339,7 +339,7 @@ interface Param_Test // Recursive structs. Contains a sequence of itself. struct Recursive_Struct; typedef sequence<Recursive_Struct> RecStructSeq; - + struct Recursive_Struct { long x; @@ -355,7 +355,7 @@ interface Param_Test // recursive union. union nested_rec_union; typedef sequence<nested_rec_union> NestedSeq; - + union nested_rec_union switch (short) { case 0: long value; @@ -364,7 +364,7 @@ interface Param_Test union Recursive_Union; typedef sequence<Recursive_Union> RecUnionSeq; - + union Recursive_Union switch (short) { case 0: RecUnionSeq rec_member; diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/run_test.pl b/TAO/tests/Portable_Interceptors/Bug_3079/run_test.pl index a0f0d93247b..def26a31c2c 100755 --- a/TAO/tests/Portable_Interceptors/Bug_3079/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Bug_3079/run_test.pl @@ -36,7 +36,7 @@ $client->DeleteFile ($iorbase3); $SV1 = $server1->CreateProcess ("server", "-o $server1_iorfile -c 1 -n 1 -s 1"); $SV2 = $server2->CreateProcess ("server", "-o $server2_iorfile -n 2 -s 2"); $SV3 = $server3->CreateProcess ("server", "-o $server3_iorfile -n 3 -s 3"); -$CL = $client->CreateProcess ("client", +$CL = $client->CreateProcess ("client", "-p file://$client_iorfile1 -f file://$client_iorfile2 -s file://$client_iorfile3"); $status = 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl index 1332b6d98b2..4eaa929ca10 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/test.idl +++ b/TAO/tests/Portable_Interceptors/Bug_3582/test.idl @@ -8,7 +8,7 @@ module RTTest interface test { /// Return the number assigned to the current object. For - /// example, object one will return "1," + /// example, object one will return "1," short number (); oneway void shutdown (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test.idl b/TAO/tests/Portable_Interceptors/Dynamic/test.idl index e46baae1473..a5be699d716 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test.idl +++ b/TAO/tests/Portable_Interceptors/Dynamic/test.idl @@ -46,7 +46,7 @@ module Test_Interceptors /// Normal operation with a return val. long calculate (in long one, in long two); - + readonly attribute VarLenStruct the_structure; /// Throws a user exception. diff --git a/TAO/tests/QtTests/test.idl b/TAO/tests/QtTests/test.idl index 1dc08b44be6..d65cc24720a 100644 --- a/TAO/tests/QtTests/test.idl +++ b/TAO/tests/QtTests/test.idl @@ -3,7 +3,7 @@ interface LCD_Display { void send_val (in long val); - // Remote method through which the + // Remote method through which the // slider sets the value of the lcd display void shutdown (); diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl index d51b5d263d5..89fb6d384b9 100755 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/run_test.pl @@ -15,15 +15,15 @@ $number_of_clients = 4; $status = 0; $continuous = ($^O eq 'hpux'); -@configurations = +@configurations = ({ - file => "ior_1", + file => "ior_1", description => "Invoking methods on servant in default thread pool", },{ - file => "ior_2", + file => "ior_2", description => "Invoking methods on servant in first RT thread pool (without lanes)", },{ - file => "ior_3", + file => "ior_3", description => "Invoking methods on servant in second RT thread pool (with lanes)", }, ); @@ -38,7 +38,7 @@ sub run_clients my @parms = @_; $arg = $parms[0]; $clients = $parms[1]; - + for ($i = 0; $i < $clients; $i++) { $CL[$i] = $client->CreateProcess ("client", $arg); @@ -72,7 +72,7 @@ for $test (@configurations) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } + } else { print STDERR "ERROR: cannot find ior file: $test->{file}\n"; $status = 1; @@ -85,7 +85,7 @@ for $test (@configurations) { print STDERR "\n*************************************************************\n"; print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - + $iorfile = $client->LocalFile ($test->{file}); run_clients ("-k file://$iorfile", $number_of_clients); print STDERR "Prepare next cycle"; diff --git a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl index 72aaa9fa9f4..c60447d6388 100755 --- a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl +++ b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl @@ -65,7 +65,7 @@ sub run_server if ($SV->Spawn () == -1) { exit 1; } - + if ($server->WaitForFileTimed ($iorbase, $server->ProcessStartWaitInterval()) == -1) { check_supported_priorities ($SV); @@ -83,7 +83,7 @@ sub zap_server print STDERR "ERROR: server returned $server_status\n"; $status = 1; } - + $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl index 56cc7f6a747..ebebfc4f323 100755 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl @@ -129,20 +129,20 @@ elsif ($iiop_requests != $shmiop_requests) { print "ERROR: Number of iiop requests differs from shmiop differs from " ."number of iterations\n"; - print "IIOP Request: "; + print "IIOP Request: "; print $iiop_requests; print "\n"; - print "IIOP Request: "; + print "IIOP Request: "; print $iiop_requests; print "\n"; ++$errors; } -elsif (($priority1 != $priority2 +elsif (($priority1 != $priority2 and ($priority1_requests != $priority2_requests or $priority1_requests != $iterations)) - or ($priority1 == $priority2 - and ($priority2_requests != 0 + or ($priority1 == $priority2 + and ($priority2_requests != 0 or $priority1_requests != 2*$iterations))) { print "ERROR: Nonmatching number of requests of each priority\n"; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl index 0f283da95ba..05b3c10408f 100755 --- a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl +++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl @@ -13,7 +13,7 @@ $status = 0; my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; -@iorfiles = +@iorfiles = ( "root", "child", @@ -36,7 +36,7 @@ sub run_client $CL = $client->CreateProcess ("client", @_); $CL->Spawn (); - + $client_status = $CL->WaitKill ($client->ProcessStartWaitInterval ()); if ($client_status != 0) { @@ -64,18 +64,18 @@ for $file (@iorfiles) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } - else { + } + else { print STDERR "ERROR: cannot find ior file: $server_iorfile\n"; $status = 1; goto kill_server; } } - + print STDERR "\n******************************************************\n"; print STDERR "Invoking methods on servant in $file poa\n"; print STDERR "******************************************************\n\n"; - + run_client ("-k file://$client_iorfile"); } @@ -86,7 +86,7 @@ print STDERR "**************************\n\n"; $ior_file = $client->LocalFile ($iorfiles[0]); run_client ("-k file://$ior_file -i 0 -x"); -kill_server: +kill_server: print STDERR "Killing server...\n"; $server_status = $SV->Kill ($server->ProcessStopWaitInterval ()); diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index ada7040bb13..dc91a8ecbf8 100755 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -85,7 +85,7 @@ sub run_client my $client_args = "@_" . " $extra_client_args"; print "client $client_args\n"; - + $CL = $client->CreateProcess ("client", "$client_args"); $CL->Spawn (); diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl index 777edcbd732..05bf789d0cd 100755 --- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl @@ -64,15 +64,15 @@ if ($server_status != 0) { if ($server->WaitForFileTimed ($iorbase2, $server->ProcessStartWaitInterval ()) == -1) { - $server_status = $SV->TimedWait (1); - if ($server_status == 2) { + $server_status = $SV->TimedWait (1); + if ($server_status == 2) { # Mark as no longer running to avoid errors on exit. - $SV->{RUNNING} = 0; - exit $status; - } - else { - print STDERR "ERROR: cannot find file <$server_iorfile2>\n"; - $SV->Kill (); + $SV->{RUNNING} = 0; + exit $status; + } + else { + print STDERR "ERROR: cannot find file <$server_iorfile2>\n"; + $SV->Kill (); exit 1; } } diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index 3f3754b03ab..2a3ba89d6f6 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -15,15 +15,15 @@ $number_of_clients = 4; $status = 0; $continuous = ($^O eq 'hpux'); -@configurations = +@configurations = ({ - file => "ior_1", + file => "ior_1", description => "Invoking methods on servant in default thread pool", },{ - file => "ior_2", + file => "ior_2", description => "Invoking methods on servant in first RT thread pool (without lanes)", },{ - file => "ior_3", + file => "ior_3", description => "Invoking methods on servant in second RT thread pool (with lanes)", }, ); @@ -38,7 +38,7 @@ sub run_clients my @parms = @_; $arg = $parms[0]; $clients = $parms[1]; - + for ($i = 0; $i < $clients; $i++) { $CL[$i] = $client->CreateProcess ("client", $arg); @@ -72,7 +72,7 @@ for $test (@configurations) { # Mark as no longer running to avoid errors on exit. $SV->{RUNNING} = 0; exit $status; - } + } else { print STDERR "ERROR: cannot find ior file: $test->{file}\n"; $status = 1; @@ -85,7 +85,7 @@ for $test (@configurations) { print STDERR "\n*************************************************************\n"; print STDERR "$test->{description}\n"; print STDERR "*************************************************************\n\n"; - + $iorfile = $client->LocalFile ($test->{file}); run_clients ("-k file://$iorfile", $number_of_clients); print STDERR "Prepare next cycle"; diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl index 237be8be118..c6cfc4f738a 100755 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/run_test.pl @@ -29,12 +29,12 @@ $client->DeleteFile($iorbase); $SV = $server->CreateProcess ("Scheduler_Interceptor_Server", "-ORBdebuglevel $debug_level " . "-f $server_iorfile"); - + $CL = $client->CreateProcess ("Scheduler_Interceptor_Client", "-f $client_iorfile"); - + print STDERR "Starting Server\n"; - + $server_status = $SV->Spawn (); if ($server_status != 0) { diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl b/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl index c0c3d7e9da1..af5ea5b8b16 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test.idl @@ -2,7 +2,7 @@ interface test { oneway void one_way (in string message); - + string two_way (in string message); oneway void shutdown (); diff --git a/TAO/tests/Smart_Proxies/Benchmark/test.idl b/TAO/tests/Smart_Proxies/Benchmark/test.idl index 4ff86645b77..5bcb1fa79dd 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/test.idl +++ b/TAO/tests/Smart_Proxies/Benchmark/test.idl @@ -6,7 +6,7 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // and shows how it can improve performace via caching. short box_prices (); diff --git a/TAO/tests/Smart_Proxies/On_Demand/test.idl b/TAO/tests/Smart_Proxies/On_Demand/test.idl index c3478d7e120..0f8886ac634 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/test.idl +++ b/TAO/tests/Smart_Proxies/On_Demand/test.idl @@ -10,7 +10,7 @@ interface Test // which has a method which can be 'smartified' // to provide extra functionality. - exception Oops + exception Oops { string reason; }; diff --git a/TAO/tests/Smart_Proxies/Policy/test.idl b/TAO/tests/Smart_Proxies/Policy/test.idl index f870179f56d..6d98cb1223c 100644 --- a/TAO/tests/Smart_Proxies/Policy/test.idl +++ b/TAO/tests/Smart_Proxies/Policy/test.idl @@ -6,12 +6,12 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // Note that though the interface has two methods just one - // of them can be "smartified" if necessary, the other one + // of them can be "smartified" if necessary, the other one // simply performs the same way as would the default proxy. - exception Oops + exception Oops { string reason; }; diff --git a/TAO/tests/Smart_Proxies/dtor/test.idl b/TAO/tests/Smart_Proxies/dtor/test.idl index 5ab792d6458..06d125afd30 100644 --- a/TAO/tests/Smart_Proxies/dtor/test.idl +++ b/TAO/tests/Smart_Proxies/dtor/test.idl @@ -1,11 +1,11 @@ //$Id$ -// This test is to ensure if the destruction process -// and the _non_existent() function in the smart proxy -// is working properly. +// This test is to ensure if the destruction process +// and the _non_existent() function in the smart proxy +// is working properly. -interface Test +interface Test { void hello (in long howmany); oneway void shutdown (); diff --git a/TAO/tests/Smart_Proxies/test.idl b/TAO/tests/Smart_Proxies/test.idl index f870179f56d..6d98cb1223c 100644 --- a/TAO/tests/Smart_Proxies/test.idl +++ b/TAO/tests/Smart_Proxies/test.idl @@ -6,12 +6,12 @@ interface Test // A simple test interface // // = DESCRIPTION - // This test demostrates the smart proxy feature in TAO + // This test demostrates the smart proxy feature in TAO // Note that though the interface has two methods just one - // of them can be "smartified" if necessary, the other one + // of them can be "smartified" if necessary, the other one // simply performs the same way as would the default proxy. - exception Oops + exception Oops { string reason; }; diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp index ff63da47815..cedde496a0d 100644 --- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp +++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp @@ -60,7 +60,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ++result; } } - + if (mytransport[0].purged_count () != 1) { ACE_ERROR ((LM_ERROR, "ERROR Incorrect purged count for transport 0: %d\n", mytransport[0].purged_count ())); diff --git a/TAO/tests/Xt_Stopwatch/test.idl b/TAO/tests/Xt_Stopwatch/test.idl index 74e2d42aa80..a3fffd63f86 100644 --- a/TAO/tests/Xt_Stopwatch/test.idl +++ b/TAO/tests/Xt_Stopwatch/test.idl @@ -1,6 +1,6 @@ // $Id$ -interface Stopwatch +interface Stopwatch { void start (); // Start the Stop watch diff --git a/TAO/tests/objref_comparison_test/foo.idl b/TAO/tests/objref_comparison_test/foo.idl index 4e6dc131bea..6c5acbe1288 100644 --- a/TAO/tests/objref_comparison_test/foo.idl +++ b/TAO/tests/objref_comparison_test/foo.idl @@ -3,7 +3,7 @@ #ifndef FOO_IDL #define FOO_IDL -interface foo +interface foo { boolean match_references (); }; diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp index b9e71b0c68f..91cde3a4952 100644 --- a/TAO/utils/NamingViewer/NamingViewer.cpp +++ b/TAO/utils/NamingViewer/NamingViewer.cpp @@ -67,7 +67,7 @@ BOOL CNamingViewerApp::InitInstance() { int argc = Argv.argc (); CORBA::ORB_var ORB = CORBA::ORB_init(argc, Argv.argv()); - + CNamingViewerDlg dlg(ORB); m_pMainWnd = &dlg; int const nResponse = dlg.DoModal(); diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index f39a9024f0f..454a2d03a37 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -578,19 +578,19 @@ Catior_i::cat_tao_tag_endpoints (TAO_InputCDR& stream) const char *host = epseq[iter].host; CORBA::UShort port = epseq[iter].port; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Endpoint #%d:\n", iter+1); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Host: %s\n", host); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Port: %d\n", port); buffer_ += buf; indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "Priority: %d\n", epseq[iter].priority); buffer_ += buf; } @@ -1242,7 +1242,7 @@ Catior_i::cat_profile_helper (TAO_InputCDR& stream, && iiop_version_minor <= 2)) { indent (); - ACE_OS::snprintf (buf, bufsize, + ACE_OS::snprintf (buf, bufsize, "detected new v%d.%d %C profile that catior cannot decode\n", iiop_version_major, iiop_version_minor, diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 8bee29de488..cad43310921 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -729,11 +729,11 @@ Invocation::dump_detail (ostream &strm, int indent, Dump_Mode mode, bool show_ha strm << " " << this->repl_octets_->thread()->alias(); #endif char rstat = this->repl_octets_->reply_status(); - switch (rstat) + switch (rstat) { case 0: break; - case 1: + case 1: strm << " User Exception"; break; case 2: diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp index 4a0b7c9992c..7765963e770 100644 --- a/TAO/utils/logWalker/Session.cpp +++ b/TAO/utils/logWalker/Session.cpp @@ -90,7 +90,7 @@ Session::find_process (long pid) Processes::ENTRY *entry; if (this->processes_.find(pid,entry) == 0) return entry->item(); - else + else return 0; } @@ -145,7 +145,7 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub) if (this->has_dir()) { ACE_CString outname = this->base_dir_; - + if (oldstream == 0) { ACE_OS::mkdir(this->base_dir_.c_str()); @@ -170,13 +170,13 @@ Session::stream_for ( ostream *oldstream, HostProcess *hp, const char *sub) return &cout; } -void +void Session::dump () { bool single = !this->has_dir(); ostream *strm = this->stream_for(0); - - // report session metrics + + // report session metrics if (single) *strm << "Session summary report: " @@ -250,7 +250,7 @@ Session::dump () // iterate over the collection of host processes to associate peer -// processes via endpoints. +// processes via endpoints. void Session::reconcile (void) { diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index cf15d84f9a2..eff70a7e625 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -33,7 +33,7 @@ Thread::pending_peer (void) const return this->new_connection_; } -void +void Thread::enter_wait (PeerProcess *pp) { this->pending_.push (pp); @@ -44,7 +44,7 @@ Thread::enter_wait (PeerProcess *pp) this->nested_++; } -void +void Thread::exit_wait (PeerProcess *pp, size_t linenum) { PeerProcess *old; @@ -52,7 +52,7 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum) return; while (old != pp) { - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_ERROR, "Line %d, Ending an invocation to peer %s, but most recent started" " is to peer %s\n", linenum, pp->id(), old->id())); // this->pending_.push(old); @@ -61,19 +61,19 @@ Thread::exit_wait (PeerProcess *pp, size_t linenum) } } -long +long Thread::max_depth (void) const { return this->max_depth_; } -long +long Thread::encounters (void) const { return this->encounters_; } -long +long Thread::id (void) const { return this->id_; @@ -103,7 +103,7 @@ Thread::active_handle (long handle) this->active_handle_ = handle; } -long +long Thread::active_handle (void) const { return this->active_handle_; @@ -115,7 +115,7 @@ Thread::giop_target (void) return this->giop_target_; } -void +void Thread::set_giop_target (Invocation::GIOP_Buffer *buffer) { this->giop_target_ = buffer; @@ -130,12 +130,12 @@ Thread::add_invocation (Invocation *inv) void Thread::dump_detail (ostream &strm) { - strm << " " << this->alias_ << " tid = " << this->id_ + strm << " " << this->alias_ << " tid = " << this->id_ << "\t" << this->encounters_ << " encounters"; if (nested_ > 0) - strm <<", with " << this->nested_ << " nested upcalls, max depth " + strm <<", with " << this->nested_ << " nested upcalls, max depth " << this->max_depth_; - strm << endl; + strm << endl; } void diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp index 626dcb37354..06a9e992a7f 100644 --- a/TAO/utils/logWalker/logWalker.cpp +++ b/TAO/utils/logWalker/logWalker.cpp @@ -1,12 +1,12 @@ // $Id$ -// Utility to traverse and simplify verbose log files. +// Utility to traverse and simplify verbose log files. // // The goal is to take a collection of log files and extract details // related to connections, objects, and invocations to separate out // perhaps multiple processes, or at least threads to get a sense of // invocation lifecycle. -// +// // Ideally a collection of files could be used so that invocations // that traverse many processes could be tracked. @@ -56,7 +56,7 @@ parse_manifest (Session &session, ACE_TCHAR *filename) while (!strm.eof()) { strm.getline(buffer,500); - if (buffer[0] == '\0' || + if (buffer[0] == '\0' || buffer[0] == '#') { continue; diff --git a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp index a2fb3bb74ec..c3054807464 100644 --- a/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp +++ b/TAO/utils/wxNamingViewer/wxAddNameServerDlg.cpp @@ -8,7 +8,7 @@ #include "wxAddNameServerDlg.h" #include "wxNamingViewer.h" - + #include "wx/sizer.h" #include "wx/textctrl.h" @@ -17,7 +17,7 @@ namespace // anonymous void create_dialog_components( wxDialog* dialog) { wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL); - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -40,7 +40,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -63,7 +63,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -85,12 +85,12 @@ namespace // anonymous button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } }; // anonymous - + WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent) #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) : wxDialog() @@ -109,7 +109,7 @@ WxAddNameServerDlg::WxAddNameServerDlg( wxWindow* parent) { #if defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) LoadFromResource( parent, "addNameServer"); -#else +#else create_dialog_components( this); #endif // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1) wxButton* ctrl = static_cast<wxButton*>( wxFindWindowByName( diff --git a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp index ab4b66c916a..748c51c5ec7 100644 --- a/TAO/utils/wxNamingViewer/wxBindNewContext.cpp +++ b/TAO/utils/wxNamingViewer/wxBindNewContext.cpp @@ -14,7 +14,7 @@ namespace // anonymous void create_dialog_components( wxDialog* dialog) { wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL); - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -37,7 +37,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + { wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL); sizer->Add( @@ -60,7 +60,7 @@ namespace // anonymous 0, wxALIGN_LEFT | wxEXPAND); } - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -82,11 +82,11 @@ namespace // anonymous button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } - + }; // anonymous WxBindNewContext::WxBindNewContext( wxWindow* parent) diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp index e5ba621186d..8657771243d 100644 --- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp +++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp @@ -27,14 +27,14 @@ namespace // anonymous wxDefaultSize, 0, 0, - wxLB_SINGLE, + wxLB_SINGLE, wxDefaultValidator, - "serversList" + "serversList" ), 1, wxEXPAND | wxALL, 5); - + wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL ); { wxButton* okButton = new wxButton( dialog, wxID_OK, "OK" ); @@ -65,12 +65,12 @@ namespace // anonymous 0, wxALL, 5); - + topsizer->Add( button_sizer, 0, wxALIGN_CENTER); - + dialog->SetSizer( topsizer); topsizer->SetSizeHints( dialog); } |