diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-01 14:28:30 +0200 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-01 14:28:30 +0200 |
commit | 8956a849cf8ccd48dacaf8db7b2add3df2c4a84d (patch) | |
tree | 43fe3459fa34237a933cb8a76fa84fdea1b3ef65 | |
parent | 10b5846921aa7d988936cdc21057a592b51d7690 (diff) | |
download | ATCD-8956a849cf8ccd48dacaf8db7b2add3df2c4a84d.tar.gz |
Layout changes
* TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp:
* TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp:
* TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp:
* TAO/TAO_IDL/ast/ast_interface.cpp:
* TAO/TAO_IDL/ast/ast_union.cpp:
* TAO/TAO_IDL/be/be_global.cpp:
* TAO/examples/Advanced/ch_18/client.cpp:
* TAO/examples/Advanced/ch_18/server.h:
* TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h:
* TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h:
* TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h:
* TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
* TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
* TAO/examples/PluggableUDP/tests/Performance/client.cpp:
* TAO/examples/PluggableUDP/tests/Performance/server.cpp:
* TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp:
* TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
* TAO/orbsvcs/IFR_Service/be_global.cpp:
* TAO/orbsvcs/IFR_Service/be_produce.cpp:
* TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
* TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
* TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp:
* TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp:
* TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp:
* TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp:
* TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
* TAO/orbsvcs/orbsvcs/AV/TCP.cpp:
* TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
* TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
* TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp:
* TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp:
* TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp:
* TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h:
* TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp:
* TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h:
* TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h:
41 files changed, 65 insertions, 146 deletions
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp index ce9097d59b7..170f0499f31 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp @@ -24,12 +24,9 @@ Messenger_i::~Messenger_i (void) { } -CORBA::Boolean Messenger_i::send_message ( - const char * user_name, +CORBA::Boolean Messenger_i::send_message (const char * user_name, const char * subject, - char *& message - ) - + char *& message) { //Add your implementation here std::cerr << "Message from: " << user_name << std::endl; diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp index 8324a171429..5bb6f8ea7c7 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp @@ -7,18 +7,13 @@ ClientInitializer::ClientInitializer (void) } void -ClientInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ) +ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -ClientInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ) +ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // get Codec factory IOP::CodecFactory_var codec_factory = info->codec_factory(); diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp index b812a1851f3..84dae2a1ed6 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp @@ -6,18 +6,13 @@ ClientInitializer::ClientInitializer (void) } void -ClientInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ) +ClientInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } void -ClientInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ) +ClientInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { - // get Codec factory IOP::CodecFactory_var codec_factory = info->codec_factory(); diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp index 9031cc249d5..5537fdfb139 100644 --- a/TAO/TAO_IDL/ast/ast_interface.cpp +++ b/TAO/TAO_IDL/ast/ast_interface.cpp @@ -410,8 +410,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i, // Only redefinition of the same kind. if (i->is_local () != fd->is_local () || i_nt != fd_nt - || i->is_abstract () != fd->is_abstract () - ) + || i->is_abstract () != fd->is_abstract ()) { idl_global->err ()->error2 (UTL_Error::EIDL_REDEF, i, diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp index e7f26ff7936..eec05414e03 100644 --- a/TAO/TAO_IDL/ast/ast_union.cpp +++ b/TAO/TAO_IDL/ast/ast_union.cpp @@ -736,8 +736,7 @@ AST_Union::compute_default_value (void) LM_ERROR, ACE_TEXT ("(%N:%l) AST_Union::") ACE_TEXT ("compute_default_value - ") - ACE_TEXT ("Bad case label value\n") - ), + ACE_TEXT ("Bad case label value\n")), -1 ); } diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 41c14dc6714..32d6caf4ecc 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -2319,9 +2319,7 @@ BE_GlobalData::messaging_exceptionholder (void) // Notice the valuetype "ExceptionHolder" that it is defined in the // "Messaging" module this->messaging_exceptionholder_->set_defined_in (msg); - this->messaging_exceptionholder_->set_prefix_with_typeprefix ( - "omg.org" - ); + this->messaging_exceptionholder_->set_prefix_with_typeprefix ("omg.org"); idl_global->scopes ().pop (); @@ -2812,7 +2810,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; case 'b': if (av[i][2] == '\0') @@ -2857,7 +2854,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; // = Various 's'erver side skeleton file name endings. case 's': @@ -2895,7 +2891,6 @@ BE_GlobalData::parse_args (long &i, char **av) av[i] )); } - break; // Operation lookup strategy. // <perfect_hash>, <dynamic_hash> or <binary_search> @@ -2910,27 +2905,19 @@ BE_GlobalData::parse_args (long &i, char **av) } else if (ACE_OS::strcmp (av[i+1], "dynamic_hash") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_DYNAMIC_HASH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_DYNAMIC_HASH); } else if (ACE_OS::strcmp (av[i + 1], "perfect_hash") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_PERFECT_HASH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_PERFECT_HASH); } else if (ACE_OS::strcmp (av[i + 1], "binary_search") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_BINARY_SEARCH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_BINARY_SEARCH); } else if (ACE_OS::strcmp (av[i + 1], "linear_search") == 0) { - be_global->lookup_strategy ( - BE_GlobalData::TAO_LINEAR_SEARCH - ); + be_global->lookup_strategy (BE_GlobalData::TAO_LINEAR_SEARCH); } else { diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp index ca3f0ca4c89..c7603921699 100644 --- a/TAO/examples/Advanced/ch_18/client.cpp +++ b/TAO/examples/Advanced/ch_18/client.cpp @@ -236,9 +236,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // Get reference to initial naming context. CosNaming::NamingContext_var inc - = resolve_init<CosNaming::NamingContext>( - orb.in(), "NameService" - ); + = resolve_init<CosNaming::NamingContext>(orb.in(), "NameService"); // Look for controller in the Naming Service. CosNaming::Name n; diff --git a/TAO/examples/Advanced/ch_18/server.h b/TAO/examples/Advanced/ch_18/server.h index 4888e9a9389..bdb54aa4787 100644 --- a/TAO/examples/Advanced/ch_18/server.h +++ b/TAO/examples/Advanced/ch_18/server.h @@ -170,8 +170,7 @@ public: const PortableServer::ObjectId & oid, PortableServer::POA_ptr poa, const char * operation, - void * & cookie - ); + void * & cookie); virtual void postinvoke( @@ -179,8 +178,7 @@ public: PortableServer::POA_ptr /* poa */, const char * /* operation */, void * /* cookie */, - PortableServer::Servant /* servant */ - ) {} + PortableServer::Servant /* servant */) {} private: Controller_impl * m_ctrl; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index 9e969f284cc..688e14eff77 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -308,8 +308,7 @@ EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif DSUI_EVENT_LOG (EDF_SCHED_FAM, CALL_KOKYU_DISPATCH_UPDATE_SCHEDULE, diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index 9e66919b894..f29d4b42b52 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -72,8 +72,7 @@ public ::CORBA::LocalObject virtual EDF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 58382e590b9..ba3caeee9c2 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -311,8 +311,7 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 7ef371fe041..0639728d996 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -306,8 +306,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index 4989577cd04..bbd078cc7ec 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -72,8 +72,7 @@ public ::CORBA::LocalObject virtual MIF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index 94a2d5affd5..5193fbbae92 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -320,8 +320,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t|%T): send_request : ") - ACE_TEXT ("about to call scheduler to inform block\n") - )); + ACE_TEXT ("about to call scheduler to inform block\n"))); #endif kokyu_dispatcher_->update_schedule (guid.in (), diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index 48ca109ea68..1ef90070061 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -88,8 +88,7 @@ public ::CORBA::LocalObject virtual MUF_Scheduling::SchedulingParameterPolicy_ptr - create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value - ); + create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value); void shutdown (void); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 7434ad5c740..01cf271ab38 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -122,8 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -302,8 +301,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index 0b4ad021f97..f4c54c08fff 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -122,8 +122,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -296,8 +295,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index ada335dc7f1..d6e1f1ae4c3 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -127,8 +127,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { @@ -366,8 +365,7 @@ Worker::svc (void) if (errno == ENOTSUP) { ACE_ERROR((LM_ERROR, - ACE_TEXT ("getprio not supported\n") - )); + ACE_TEXT ("getprio not supported\n"))); } else { diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp index 72f7bb4ebe0..eb6e6a10137 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp @@ -126,9 +126,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) client->wait (); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (1, // ethernalize objects + 0); // wait for completion orb->destroy (); diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp index 87e563c6ab8..59fdd903710 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp @@ -162,9 +162,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "ORB finished\n")); - root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + root_poa->destroy (1, // ethernalize objects + 0) // wait for completion orb->destroy (); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index ddc2a0b93ee..9e0a217a91a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -71,13 +71,10 @@ Messenger_i::~Messenger_i (void) { } -CORBA::Boolean Messenger_i::send_message ( - const char * user_name, +CORBA::Boolean Messenger_i::send_message (const char * user_name, const char * subject, - char *& message - ) + char *& message) { - std::cout << "Message from: " << user_name << std::endl; std::cout << "Subject: " << subject << std::endl; std::cout << "Message: " << message << std::endl; diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp index 3199efb2a53..1052ea3760e 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp @@ -450,8 +450,7 @@ int TAO::FT_FaultNotifier_i::init (CORBA::ORB_ptr orb ) this->this_name_.length (1); this->this_name_[0].id = CORBA::string_dup (this->ns_name_); - this->naming_context_->rebind (this->this_name_, this_obj.in() //CORBA::Object::_duplicate(this_obj) - ); + this->naming_context_->rebind (this->this_name_, this_obj.in()); } } diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp index b1649c0eb44..fd630201645 100644 --- a/TAO/orbsvcs/IFR_Service/be_global.cpp +++ b/TAO/orbsvcs/IFR_Service/be_global.cpp @@ -170,8 +170,7 @@ BE_GlobalData::parse_args (long &i, char **av) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("IDL: I don't understand the '%s' option\n"), - av[i] - )); + av[i])); ACE_OS::exit (99); } diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp index 79b85bd6728..3590aaad0f8 100644 --- a/TAO/orbsvcs/IFR_Service/be_produce.cpp +++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp @@ -175,8 +175,7 @@ BE_produce (void) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") - ACE_TEXT (" failed to accept removing visitor\n") - )); + ACE_TEXT (" failed to accept removing visitor\n"))); BE_abort (); } @@ -192,8 +191,7 @@ BE_produce (void) ORBSVCS_ERROR (( LM_ERROR, ACE_TEXT ("(%N:%l) BE_produce -") - ACE_TEXT (" failed to accept adding visitor\n") - )); + ACE_TEXT (" failed to accept adding visitor\n"))); BE_abort (); } diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp index 12741f1a6ae..da0846fb285 100644 --- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp +++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp @@ -87,8 +87,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") - ACE_TEXT (" bad node in this scope\n") - ), + ACE_TEXT (" bad node in this scope\n")), -1 ); } @@ -106,8 +105,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node) ORBSVCS_ERROR_RETURN (( LM_ERROR, ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -") - ACE_TEXT (" failed to accept visitor\n") - ), + ACE_TEXT (" failed to accept visitor\n")), -1 ); } @@ -125,9 +123,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node) try { this->ir_current_ = - be_global->repository ()->get_primitive ( - this->predefined_type_to_pkind (node) - ); + be_global->repository ()->get_primitive (this->predefined_type_to_pkind (node)); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp index 26da1d2d24d..d190a34fcb1 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp @@ -140,8 +140,7 @@ run_service_command (Activator_Options& opts) pathname, 0, // group 0, // tag - DEPENDS_ON - ); + DEPENDS_ON); } else { diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 94fcde603e3..4e7356da398 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -314,8 +314,7 @@ void CosEC_ServantBase::init_ConsumerQOS (RtecBase::handle_t cons_handle, ACE_ConsumerQOS_Factory &consumer_qos, ACE_TCHAR *eventTypeIds, - ACE_TCHAR *eventSourceIds - ) + ACE_TCHAR *eventSourceIds) { // @@ Pradeep: ditto here, make the set of sources (and/or type) // a parameter, and make sure the user can specify multiple of diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp index a98e8540d7e..deb993c4de8 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp @@ -36,9 +36,7 @@ Country_i::get_typed_consumer (void) } void -Country_i::push (const CORBA::Any & /* data */ - ) - +Country_i::push (const CORBA::Any & /* data */) { //Add your implementation here } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp index 1dd31a372c0..9d5fef0101d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp @@ -135,8 +135,7 @@ TAO_Notify_Lanes_Supplier::deactivate (void) void TAO_Notify_Lanes_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp index 8defbca6e3b..d58430352d4 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp @@ -136,8 +136,7 @@ TAO_Notify_ThreadPool_Supplier::deactivate (void) void TAO_Notify_ThreadPool_Supplier::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 6da3603d0c6..1fad41a8e47 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -3669,8 +3669,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer, { ACE_INET_Addr mcast_addr; mcast_addr.set (this->mcast_port_, - this->mcast_addr_.c_str () - ); + this->mcast_addr_.c_str ()); ACE_TCHAR buf [BUFSIZ]; mcast_addr.addr_to_string (buf, BUFSIZ); diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp index b0b10f58da8..afe9e424271 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp @@ -486,8 +486,7 @@ TAO_AV_TCP_Acceptor::make_svc_handler (TAO_AV_TCP_Flow_Handler *&tcp_handler) { if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG, - "TAO_AV_TCP_Acceptor::make_svc_handler\n" - )); + "TAO_AV_TCP_Acceptor::make_svc_handler\n")); if (this->endpoint_ != 0) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp index 4c45bd1404f..28e42513918 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp @@ -151,8 +151,7 @@ TAO_Notify_ConsumerAdmin::load_proxy ( CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, - CosNotifyChannelAdmin::ProxyID_out proxy_id - ) + CosNotifyChannelAdmin::ProxyID_out proxy_id) { CosNotification::QoSProperties initial_qos; @@ -168,8 +167,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier (CosNotifyChannelAdm CosNotifyChannelAdmin::ProxySupplier_ptr TAO_Notify_ConsumerAdmin::obtain_notification_push_supplier_with_qos (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id, - const CosNotification::QoSProperties & initial_qos - ) + const CosNotification::QoSProperties & initial_qos) { CosNotifyChannelAdmin::ProxySupplier_var proxy = TAO_Notify_PROPERTIES::instance()->builder()->build_proxy (this @@ -237,8 +235,7 @@ TAO_Notify_ConsumerAdmin::get_qos (void) void TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ) + const CosNotification::EventTypeSeq & removed) { TAO_Notify_EventTypeSeq seq_added (added); TAO_Notify_EventTypeSeq seq_removed (removed); @@ -333,8 +330,7 @@ TAO_Notify_ConsumerAdmin::obtain_notification_pull_supplier (CosNotifyChannelAdm void TAO_Notify_ConsumerAdmin::validate_qos (const CosNotification::QoSProperties & /*required_qos*/, - CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ - ) + CosNotification::NamedPropertyRangeSeq_out /*available_qos*/) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp index 09cdf6e0b86..a51e3da7ba7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp @@ -318,8 +318,7 @@ TAO_Notify_EventChannelFactory::load_event_persistence (void) //@@todo: tell the rspm it's an orphan, but we can't during reload // we need collect these and come back later to remove them ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) Reload persistent event failed.\n") - )); + ACE_TEXT ("(%P|%t) Reload persistent event failed.\n"))); } } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index d9b23ee999f..17fb3f4f5d0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -98,8 +98,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Servant_var<TAO_EC_Event_Channel> ec_impl ( RTEC_Initializer::create (ec_poa.in (), ec_poa.in (), - rtserver_setup.rtcorba_setup ()) - ); + rtserver_setup.rtcorba_setup ())); ec_impl->activate (); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 337b6154c70..bea3d81305d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -35,8 +35,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, CORBA::Boolean Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */ - ) + const AVStreams::flowSpec &/* the_flows */) { ACE_DEBUG ((LM_DEBUG, "Sender_StreamEndPoint::modify_QoS\n")); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 1efe0bb67a8..ed682834aea 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -142,8 +142,7 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice, int Distributer::init (int /*argc*/, - ACE_TCHAR *[] /*argv*/ - ) + ACE_TCHAR *[] /*argv*/) { // Initialize the naming services int result = diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index 693b51e7f9f..c3a323f966f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -36,8 +36,7 @@ public: TAO_AV_Protocol_Object *object); CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos, - const AVStreams::flowSpec &/* the_flows */ - ); + const AVStreams::flowSpec &/* the_flows */); protected: /// Application callback. TAO_AV_Callback callback_; diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp index 46fc9e4d5d0..66b11a2c88d 100644 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp @@ -17,8 +17,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) CORBA::ContainedSeq_var interfaces = repo_->contents (CORBA::dk_Interface, // Any type of contained object. - 1 // Exclude parents of interfaces. - ); + 1) // Exclude parents of interfaces. CORBA::ULong length = interfaces->length (); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index 318497270b3..4bafa4e0a52 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -28,22 +28,18 @@ public: Server_ORBInitializer2 (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); void set_server_iogr (CORBA::Object_ptr obj); private: /// Register the necessary interceptors. - void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info - ); + void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - // Private temprorary pointer + // Private temporary pointer TAO249_ServerRequest_Interceptor2 *sri_; }; diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h index a880888c4b6..4bafa4e0a52 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h @@ -37,10 +37,9 @@ public: private: /// Register the necessary interceptors. - void register_server_request_interceptors ( - PortableInterceptor::ORBInitInfo_ptr info); + void register_server_request_interceptors (PortableInterceptor::ORBInitInfo_ptr info); - // Private temprorary pointer + // Private temporary pointer TAO249_ServerRequest_Interceptor2 *sri_; }; |