diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-06-01 16:48:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 16:48:56 +0200 |
| commit | ca255ecc3e29d1ca2ae1d93374cee6f3e12d3b72 (patch) | |
| tree | 850bd36971eae8741ad1e37dd5ffae05c9e444b7 | |
| parent | 2f2521cd6e9d7803c9b94b683f62741a72b1682a (diff) | |
| parent | 80bce7afb0cccdb9dbf82b24aebdcb36f918f2aa (diff) | |
| download | ATCD-ca255ecc3e29d1ca2ae1d93374cee6f3e12d3b72.tar.gz | |
Merge pull request #633 from jwillemsen/master
Removed last TAO env macros and some layout changes
77 files changed, 174 insertions, 373 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/Auth/Messenger_i.h b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h index f4467924f58..8ab4755edce 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.h @@ -29,9 +29,7 @@ public: virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, - char *& message - ); - + char *& message); }; 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/docs/events_tutorial.html b/TAO/docs/events_tutorial.html index e171be0693d..932407266c6 100644 --- a/TAO/docs/events_tutorial.html +++ b/TAO/docs/events_tutorial.html @@ -549,19 +549,13 @@ defaults to 1. // Create new RT_Info descriptors for three events. RtecScheduler::handle_t handle1 = - server->create ("event_1", // Name of entry point - TAO_TRY_ENV // Environment - ); + server->create ("event_1"); // Name of entry point RtecScheduler::handle_t handle2 = - server->create ("event_2", // Name of entry point - TAO_TRY_ENV // Environment - ); + server->create ("event_2"); // Name of entry point RtecScheduler::handle_t handle3 = - server->create ("event_3", // Name of entry point - TAO_TRY_ENV // Environment - ); + server->create ("event_3"); // Name of entry point // Register as a consumer/supplier: act as a supplier of event_1 but with @@ -576,8 +570,7 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 0, // Threads - will depend on event_3 - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a producer of event_2. server->set (handle2, // RT_Info handle @@ -589,8 +582,7 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a consumer of event_3. server->set (handle3, // RT_Info handle @@ -602,17 +594,13 @@ defaults to 1. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 0, // Threads - will depend on supplier - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Establish a dependency of event_1 on event_3. server->add_dependency (handle1, // handle that depends handle3, // handle that is depended on - 1, // number of calls per event occurance - TAO_TRY_ENV // environment - ); - + 1); // number of calls per event occurrence </pre> </table> @@ -738,8 +726,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Initialize the ORB reference. this->orb_ = - CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, ""); // Initialize the root POA reference. CORBA::Object_var poa_object = @@ -751,13 +738,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Obtain the narrowed root POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); // Obtain a reference to the POA manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; + root_poa->the_POAManager (); // Now some boiler plate code to obtain a reference to the // naming service..... @@ -772,8 +757,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Narrow the naming service reference. CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Use the Naming Service to locate the Scheduling Service and // use the Scheduler_Factory to keep a global pointer to the @@ -792,27 +776,22 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) // Resolve a reference to the event service. CORBA::Object_var ec_obj = - naming_context->resolve (name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->resolve (name); // Narrow the reference to the event service. RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Connect consumers to the event service. - this->connect_consumers (channel.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + this->connect_consumers (channel.in ()); ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n")); ACE_DEBUG ((LM_DEBUG, "running the test\n")); @@ -825,22 +804,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) this->dump_results (); // Disconnect consumers from the event service. - this->disconnect_consumers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->disconnect_consumers (); // Destroy the event service. - channel->destroy (TAO_TRY_ENV); - TAO_CHECK_ENV; + channel->destroy (); } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (const CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -1038,14 +1014,10 @@ server. // Create new RT_Info descriptors for two events. RtecScheduler::handle_t handle0 = - server->create ("event_0", // Name of entry point - TAO_TRY_ENV // Environment - ); + server->create ("event_0"); // Name of entry point RtecScheduler::handle_t handle1 = - server->create ("event_1", // Name of entry point - TAO_TRY_ENV // Environment - ); + server->create ("event_1"); // Name of entry point // Register as a producer of event_0. server->set (handle0, // RT_Info handle @@ -1057,8 +1029,7 @@ server. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type // Register as a producer of event_1. server->set (handle1, // RT_Info handle @@ -1070,8 +1041,7 @@ server. RtecScheduler::LOW_IMPORTANCE, // Importance 0, // Quantum (unused) 1, // Threads - RtecScheduler::OPERATION, // Info type - TAO_TRY_ENV); + RtecScheduler::OPERATION); // Info type </pre> </table> @@ -1228,8 +1198,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Initialize the ORB reference. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, ""); // Initialize the root POA reference. CORBA::Object_var poa_object = @@ -1241,14 +1210,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Obtain the narrowed root POA reference. PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); // Obtain a reference to the POA manager. PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; - + root_poa->the_POAManager (); // Now some boiler plate code to obtain a reference to the // naming service..... @@ -1263,8 +1229,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Narrow the naming service reference. CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Use the Naming Service to locate the Scheduling Service and // use the Scheduler_Factory to keep a global pointer to the @@ -1283,33 +1248,27 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) // Resolve a reference to the event service. CORBA::Object_var ec_obj = - naming_context->resolve (name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->resolve (name); // Narrow the reference to the event service. RtecEventChannelAdmin::EventChannel_var channel; if (CORBA::is_nil (ec_obj.in ())) channel = RtecEventChannelAdmin::EventChannel::_nil (); else - channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; + channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Connect suppliers to the event service. - this->connect_suppliers (channel.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + this->connect_suppliers (channel.in ()); ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n")); // Activate the supplier objects - this->activate_suppliers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->activate_suppliers (); ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -1325,18 +1284,16 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) this->dump_results (); // Disconnect suppliers from the event service. - this->disconnect_suppliers (TAO_TRY_ENV); - TAO_CHECK_ENV; + this->disconnect_suppliers (); } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (const CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -1411,9 +1368,7 @@ Test_Supplier::svc () event[0].header.type = this->event_b_; // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->consumer_proxy ()->push (event, TAO_TRY_ENV); - - TAO_CHECK_ENV; + this->consumer_proxy ()->push (event); } // Sleep until it's time to send the next burst. @@ -1425,20 +1380,18 @@ Test_Supplier::svc () // Send one event shutdown from each supplier event[0].header.type = ACE_ES_EVENT_SHUTDOWN; - this->consumer_proxy ()->push(event, TAO_TRY_ENV); - TAO_CHECK_ENV; + this->consumer_proxy ()->push(event); this->timer_.stop (); } - TAO_CATCH (CORBA::SystemException, sys_ex) + catch (CORBA::SystemException& sys_ex) { - TAO_TRY_ENV.print_exception ("SYS_EX"); + sys_ex.print_exception ("SYS_EX"); } - TAO_CATCHANY + catch (CORBA::Exception& any_ex) { - TAO_TRY_ENV.print_exception ("NON SYS EX"); + any_ex.print_exception ("NON SYS EX"); } - TAO_ENDTRY; return 0; } @@ -1530,8 +1483,7 @@ int main (int argc, char *argv[]) // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV); - TAO_CHECK_ENV; + CORBA::ORB_init (argc, argv, "internet"); if (parse_args (argc, argv) == -1) return 1; @@ -1544,12 +1496,10 @@ int main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; + root_poa->the_POAManager (); CORBA::Object_var naming_obj = orb->resolve_initial_references ("NameService"); @@ -1559,8 +1509,7 @@ int main (int argc, char *argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + CosNaming::NamingContext::_narrow (naming_obj.in ()); // Notice the use of auto_ptr<> to automagically manage the // destruction of the servant. When the auto_ptr goes out @@ -1587,19 +1536,15 @@ int main (int argc, char *argv[]) scheduler_impl = auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler); if (scheduler_impl.get () == 0) - return 1; - scheduler = scheduler_impl->_this (TAO_TRY_ENV); - TAO_CHECK_ENV; - - CORBA::String_var str = - orb->object_to_string (scheduler.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; - ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", - str.in ())); - - // Register the servant with the Naming Context.... - naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + return 1; + scheduler = scheduler_impl->_this (); + + CORBA::String_var str = + orb->object_to_string (scheduler.in ()); + ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%C>\n", str.in ())); + + // Register the servant with the Naming Context.... + naming_context->bind (schedule_name, scheduler.in ()); } ACE_Scheduler_Factory::use_config (naming_context.in ()); @@ -1626,29 +1571,25 @@ int main (int argc, char *argv[]) // Obtain an object reference to the new channel. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (TAO_TRY_ENV); - TAO_CHECK_ENV; + ec_impl._this (); // Convert the EC object reference to a string. CORBA::String_var str = - orb->object_to_string (ec.in (), TAO_TRY_ENV); + orb->object_to_string (ec.in ()); // Output the EC object reference string (debug only). - ACE_DEBUG ((LM_DEBUG, - "The EC IOR is <%s>\n", str.in ())); + ACE_DEBUG ((LM_DEBUG, "The EC IOR is <%C>\n", str.in ())); // Register the EC with the Naming Service. CosNaming::Name channel_name (1); channel_name.length (1); channel_name[0].id = CORBA::string_dup (service_name); - naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->bind (channel_name, ec.in ()); // Activate the POA so we can start receiving requests... // Activate the POA manager. - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; + poa_manager->activate (); // Run the ORB event loop ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__)); @@ -1663,22 +1604,18 @@ int main (int argc, char *argv[]) // Remove the event service and the scheduling service from // the Naming Service. - naming_context->unbind (channel_name, TAO_TRY_ENV); - TAO_CHECK_ENV; + naming_context->unbind (channel_name); if (global_scheduler == 0) - { - naming_context->unbind (schedule_name, TAO_TRY_ENV); - TAO_CHECK_ENV; - } + { + naming_context->unbind (schedule_name); + } } - TAO_CATCHANY + catch (const CORBA::Exception& ex) { - TAO_TRY_ENV.print_exception ("EC"); + ex.print_exception ("EC"); } - TAO_ENDTRY; - return 0; } 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/examples/Simulator/DOVEBrowser/MTQueue.java b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java index 6c995dc390b..e110a4c38cb 100644 --- a/TAO/examples/Simulator/DOVEBrowser/MTQueue.java +++ b/TAO/examples/Simulator/DOVEBrowser/MTQueue.java @@ -186,7 +186,7 @@ public class MTQueue class MTQueue_Node { public MTQueue_Node prev_ = null; - public MTQueue_Node next_ = null;; + public MTQueue_Node next_ = null; public Object data_; public MTQueue_Node(Object data) diff --git a/TAO/examples/Simulator/DOVEBrowser/Queue.java b/TAO/examples/Simulator/DOVEBrowser/Queue.java index 51a52c98aac..ffa15a882a1 100644 --- a/TAO/examples/Simulator/DOVEBrowser/Queue.java +++ b/TAO/examples/Simulator/DOVEBrowser/Queue.java @@ -134,7 +134,7 @@ public class Queue class Queue_Node { public Queue_Node prev_ = null; - public Queue_Node next_ = null;; + public Queue_Node next_ = null; public Object data_; public Queue_Node(Object data) 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/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp index e80efb54cee..18b8b30e45b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.cpp @@ -9,10 +9,8 @@ StructuredEventConsumer_i::StructuredEventConsumer_i(CORBA::ORB_ptr orb) void StructuredEventConsumer_i::push_structured_event( - const CosNotification::StructuredEvent &event - ) + const CosNotification::StructuredEvent &event) { - std::cout << "event received " << std::endl; const char *value; @@ -21,26 +19,22 @@ StructuredEventConsumer_i::push_structured_event( event.filterable_data[i].value >>= value; std::cout << event.filterable_data[i].name.in() << "\t" << value << std::endl; } - } void StructuredEventConsumer_i::disconnect_structured_push_consumer() { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void StructuredEventConsumer_i::offer_change( const CosNotification::EventTypeSeq &, - const CosNotification::EventTypeSeq & - ) + const CosNotification::EventTypeSeq &) { } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h index caa915228d8..9220062f2f9 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventConsumer_i.h @@ -10,13 +10,11 @@ public: StructuredEventConsumer_i(CORBA::ORB_ptr orb); virtual void push_structured_event( - const CosNotification::StructuredEvent ¬ification - ); + const CosNotification::StructuredEvent ¬ification); virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); virtual void disconnect_structured_push_consumer(); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index b11df7abb34..11cb57adaf5 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -9,7 +9,6 @@ StructuredEventSupplier_i::StructuredEventSupplier_i(CORBA::ORB_ptr orb) void StructuredEventSupplier_i::disconnect_structured_push_supplier () { - CORBA::Object_var obj = orb_->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (obj.in()); @@ -22,8 +21,7 @@ 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/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h index 6921775d62e..3d586828ac1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.h @@ -13,8 +13,8 @@ public: virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); + private: CORBA::ORB_var orb_; }; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp index 2def116b05a..ea1a56d9e66 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp @@ -117,13 +117,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/Consumer.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp index 243b53b8b11..1b5f39bdc88 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp @@ -70,8 +70,7 @@ TAO_Notify_Lanes_Consumer::disconnect (void) void TAO_Notify_Lanes_Consumer::offer_change (const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed*/ - ) + const CosNotification::EventTypeSeq & /*removed*/) { // No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index b5c62497ab3..6945eb99a24 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -76,16 +76,13 @@ protected: // = NotifyPublish method virtual void offer_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier methods virtual void push_structured_event ( - const CosNotification::StructuredEvent & notification - ); + const CosNotification::StructuredEvent & notification); - virtual void disconnect_structured_push_consumer ( - ); + virtual void disconnect_structured_push_consumer (); }; #include /**/ "ace/post.h" 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/README b/TAO/orbsvcs/examples/Notify/README index 72bc09d2199..bf54386a0f7 100644 --- a/TAO/orbsvcs/examples/Notify/README +++ b/TAO/orbsvcs/examples/Notify/README @@ -1,5 +1,3 @@ - - Notification Service examples: This directory has examples to illustrate how to use the Notification Service diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index 94bd93658fc..a6f96cbe249 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -387,8 +387,7 @@ Subscribe_StructuredPushSupplier::disconnect (void) void Subscribe_StructuredPushSupplier::subscription_change (const CosNotification::EventTypeSeq & /*added*/, - const CosNotification::EventTypeSeq & /*removed */ - ) + const CosNotification::EventTypeSeq & /*removed */) { //No-Op. } diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index eaa628f76b6..75e6abe17a3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -12,8 +12,6 @@ #include "ace/Task.h" #include "ace/SString.h" -/// @@Pradeep, pragma please... - #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" 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/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 4ccf785450c..37548e5d2b3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -60,8 +60,7 @@ protected: // = NotifySubscribe virtual void subscription_change ( const CosNotification::EventTypeSeq & added, - const CosNotification::EventTypeSeq & removed - ); + const CosNotification::EventTypeSeq & removed); // = StructuredPushSupplier method virtual void disconnect_structured_push_supplier (void); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index ce2d91a40a7..8fe87a8af5e 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -9,8 +9,6 @@ #include "orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" - - TAO_Notify_ThreadPool_Supplier_Client::TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects) : orb_objects_ (orb_objects) , supplier_ (0) 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_; }; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 408bbff08f6..e91407c0d79 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -3604,8 +3604,7 @@ TAO_ORB_Core::valuetype_adapter (void) { TAO_Valuetype_Adapter_Factory * vt_ap_factory = ACE_Dynamic_Service<TAO_Valuetype_Adapter_Factory>::instance ( - TAO_ORB_Core::valuetype_adapter_factory_name () - ); + TAO_ORB_Core::valuetype_adapter_factory_name ()); if (vt_ap_factory) { diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h index 1777f215aa8..7a69b9e9279 100644 --- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h +++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h @@ -36,8 +36,7 @@ namespace TAO ::PortableServer::ThreadPolicyValue value); virtual void destroy ( - ThreadStrategy *strategy - ); + ThreadStrategy *strategy); }; } } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp index 8ab26007dbf..bba2c40b318 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp @@ -18,8 +18,7 @@ TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj) { return TAO_Priority_Mapping_Manager::_duplicate ( - dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj) - ); + dynamic_cast<TAO_Priority_Mapping_Manager_ptr> (obj)); } TAO_Priority_Mapping_Manager_ptr diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp index 8cdeab1213f..b1fefa0beb4 100644 --- a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp @@ -3,17 +3,15 @@ * * @author Carlos O'Ryan <coryan@atdesk.com> */ -#include "Echo_Callback.h" - +#include "Echo_Callback.h" Echo_Callback::Echo_Callback() { } void -Echo_Callback::echo_payload(Test::Payload const & - TAO_ENV_ARG_DECL_NOT_USED) +Echo_Callback::echo_payload(Test::Payload const &) { static int n = 0; n++; @@ -25,7 +23,6 @@ Echo_Callback::echo_payload(Test::Payload const & } void -Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder * - TAO_ENV_ARG_DECL_NOT_USED) +Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder *) { } diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index 1a33f5446ac..a856b824816 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -174,8 +174,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } poa_var->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2356_Regression/server.cpp b/TAO/tests/Bug_2356_Regression/server.cpp index a88b205577c..3bee8f93cbd 100644 --- a/TAO/tests/Bug_2356_Regression/server.cpp +++ b/TAO/tests/Bug_2356_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index edfd9b3a5c0..7ab1cc23b6f 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -131,9 +131,7 @@ Publisher_impl::~Publisher_impl() delete worker; } -void subscribe ( - ::Subscriber_ptr subscriber - ); +void subscribe (::Subscriber_ptr subscriber); void Publisher_impl::subscribe( diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 16f2e65e36e..8ffd6a12f67 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -272,8 +272,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index dd7cfbc2247..a8f1a9f3f6b 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -255,8 +255,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "threads finished\n")); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 1ebbc8bde8e..3cc35b7b408 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -297,8 +297,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) server->shutdown (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index d507293b4be..70949ace98e 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -132,8 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) worker.thr_mgr ()->wait (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3672_Regression/server.cpp b/TAO/tests/Bug_3672_Regression/server.cpp index e1aa13af889..f67a367ce08 100644 --- a/TAO/tests/Bug_3672_Regression/server.cpp +++ b/TAO/tests/Bug_3672_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3801_Regression/server.cpp b/TAO/tests/Bug_3801_Regression/server.cpp index e1aa13af889..f67a367ce08 100644 --- a/TAO/tests/Bug_3801_Regression/server.cpp +++ b/TAO/tests/Bug_3801_Regression/server.cpp @@ -104,8 +104,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->run (); root_poa->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp index e38fa4fe9a9..94dd6d6b5c8 100644 --- a/TAO/tests/Bug_3801_Regression/simple_client.cpp +++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp @@ -273,8 +273,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } poa_var->destroy (1, // ethernalize objects - 0 // wait for completion - ); + 0); // wait for completion orb->destroy (); } diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp index 81c6cde743f..1b24186d9b1 100644 --- a/TAO/tests/CDR/tc.cpp +++ b/TAO/tests/CDR/tc.cpp @@ -112,7 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) const char *name = tc->name (); CORBA::ULong length = 0; - // tc->length (TAO_TRY_ENV); if (TAO_debug_level > 0) { diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp index c2dbebb87a5..fa74efaad3d 100644 --- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp +++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp @@ -42,8 +42,7 @@ My_DII_Reply_Handler::handle_response(TAO_InputCDR &incoming) this->response_handler_->_tao_byte_order (incoming.byte_order ()); this->response_handler_->invoke_reply (opList.in(), - 0 // result - ); + 0); // result } catch (const CORBA::SystemException &ex) { diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 3af5b0f5e85..3c8eb33be0b 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -242,8 +242,7 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_test_seq - ); + DynAnyTests::_tc_test_seq); DynamicAny::DynSequence_var ftc1 = DynamicAny::DynSequence::_narrow (ftc1_base.in ()); @@ -263,8 +262,7 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var da_bool = dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_SeqBoolean - ); + DynAnyTests::_tc_SeqBoolean); DynamicAny::DynSequence_var ds_bool = DynamicAny::DynSequence::_narrow (da_bool.in ()); @@ -285,9 +283,7 @@ Test_DynSequence::run_test (void) )); DynamicAny::DynAny_var da_short = - dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_SeqShort - ); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_SeqShort); DynamicAny::DynSequence_var ds_short = DynamicAny::DynSequence::_narrow (da_short.in ()); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 3ef81705613..1d7151f0eb4 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -156,9 +156,7 @@ Test_DynStruct::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc1_base = - dynany_factory->create_dyn_any_from_type_code ( - DynAnyTests::_tc_test_struct - ); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct); DynamicAny::DynStruct_var ftc1 = DynamicAny::DynStruct::_narrow (ftc1_base.in ()); diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index 24a29d7b8bf..d8e42eeb1ca 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -128,8 +128,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) "Cannot open output file for writing IOR: %s", ior_output_file ), - 1 - ); + 1); } ACE_OS::fprintf (output_file, diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 49385975f6c..fa4f6948cc8 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -664,12 +664,10 @@ Param_Test_i::test_objref (Coffee_ptr o1, catch (const CORBA::SystemException& sysex) { sysex._tao_print_exception ("System Exception"); - // env.exception (TAO_TRY_ENV.exception ()); } catch (const CORBA::UserException& userex) { userex._tao_print_exception ("User Exception"); - // env.exception (TAO_TRY_ENV.exception ()); } return ret; |