diff options
Diffstat (limited to 'TAO')
293 files changed, 0 insertions, 338 deletions
diff --git a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp index 6ce5e712976..e4d990f9161 100644 --- a/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp +++ b/TAO/DevGuideExamples/AMH_AMI/inner_cb.cpp @@ -13,7 +13,6 @@ Inner_callback_i::Inner_callback_i (PortableServer::POA_ptr p, Inner_callback_i::~Inner_callback_i (void) { std::cout << "Inner_callback_i destroying" << std::endl; - } void diff --git a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp index 77880838f4f..37d68bd61df 100644 --- a/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp +++ b/TAO/DevGuideExamples/LocalObjects/Messenger/Messenger_i.cpp @@ -22,6 +22,5 @@ CORBA::Boolean Messenger_i::send_message ( CORBA::string_free(message); message = CORBA::string_dup("Thanks for the message."); return true; - } diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp index e0c2bef7b55..44fb5acca7c 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/ClientInterceptor.cpp @@ -59,7 +59,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp index b8d9b9b3a06..711e6188f93 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInterceptor.cpp @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp index c46cca7caf8..b42c29831c5 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInterceptor.cpp @@ -87,7 +87,6 @@ ClientInterceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) x = false; flag <<= CORBA::Any::from_boolean(x); pic->set_slot(slot,flag); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp index 656d2383bce..bfefd32bb06 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInterceptor.cpp @@ -20,7 +20,6 @@ ClientInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } ClientInterceptor::~ClientInterceptor (void) @@ -67,7 +66,6 @@ ClientInterceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, false); - } void diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp index e59cd9bb0d5..76e16098445 100644 --- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp +++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ServerInterceptor.cpp @@ -21,7 +21,6 @@ ServerInterceptor::ServerInterceptor (IOP::CodecFactory_var cf) // Obtain the CDR encapsulation Codec. this->codec = cf->create_codec (encoding); - } ServerInterceptor::~ServerInterceptor () diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp index f13367ddab0..01ecb59fbdd 100644 --- a/TAO/TAO_IDL/be/be_union.cpp +++ b/TAO/TAO_IDL/be/be_union.cpp @@ -187,7 +187,6 @@ be_union::destroy () this->be_scope::destroy (); this->be_type::destroy (); this->AST_Union::destroy (); - } // Visitor method. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index eab1ed7d3c8..6333aae01d4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -99,7 +99,6 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << be_uidt << be_uidt_nl << "}"; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp index 9fdb5f2cd0c..2546eba51b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp @@ -68,5 +68,4 @@ be_visitor_module_sh::visit_module (be_module *node) << node->name (); return 0; - } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 6c7bd3eb425..ded343c6836 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -180,7 +180,6 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node) } return 0; - } int diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp index 17ab3682ae8..3638b222ea6 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/alias_typecode.cpp @@ -25,7 +25,6 @@ TAO::be_visitor_alias_typecode::visit_typedef (be_typedef * node) return this->common (node, base, "tk_alias"); - } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index 30516f8ea3d..b5c8612f781 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -497,7 +497,6 @@ be_visitor_valuebox_field_ch::emit_member_set (be_decl *field, *os << "void " << field->local_name () << " (" << const_arg << field_type->name () << arg_modifier << ");" << be_nl; - } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index befadc961dc..92d885c06c6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -561,7 +561,6 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *field, << "this->_pd_value->" << field->local_name () << " = val;" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 18c7a86cf41..956ac7d7ef9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -516,7 +516,6 @@ be_visitor_valuebox_union_member_ci::emit_member_set ( << "this->_pd_value->" << field->local_name () << " (val);" << be_uidt_nl << "}" << be_nl_2; - } void diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h index 7d9e1f9108d..82bc34bf59e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h @@ -49,7 +49,6 @@ namespace TAO const char * tctype); }; - } #endif /* TAO_BE_VISITOR_ALIAS_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h index 5d3e0783214..4edc0dff0c1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/enum_typecode.h @@ -46,7 +46,6 @@ namespace TAO /// Generate structure field related TypeCode code. int visit_members (be_enum * node); }; - } #endif /* TAO_BE_VISITOR_ENUM_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h index 4a6367704d7..96103906ece 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/union_typecode.h @@ -55,7 +55,6 @@ namespace TAO /// struct or exception bool is_nested_; }; - } #endif /* TAO_BE_VISITOR_UNION_TYPECODE_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h index 6de1112aeaa..79697e1106e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/value_typecode.h @@ -55,7 +55,6 @@ namespace TAO /// struct or exception bool is_nested_; }; - } #endif /* TAO_BE_VISITOR_VALUE_TYPECODE_H */ diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h index b114b2124d3..7bfce34d745 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_PriorityMapping.h @@ -48,7 +48,6 @@ namespace Stock /// Register mapping. static void register_mapping (CORBA::ORB_ptr orb); }; - } #endif // !defined STOCK_PRIORITYMAPPING_ diff --git a/TAO/examples/Advanced/ch_12/icp.cpp b/TAO/examples/Advanced/ch_12/icp.cpp index 369d5addf5c..25fa92c8557 100644 --- a/TAO/examples/Advanced/ch_12/icp.cpp +++ b/TAO/examples/Advanced/ch_12/icp.cpp @@ -127,7 +127,6 @@ vary_temp (long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } // Function object. Locates a thermostat that is in the same room as diff --git a/TAO/examples/Advanced/ch_18/icp.cpp b/TAO/examples/Advanced/ch_18/icp.cpp index 0f93686ee37..7f22eb1e084 100644 --- a/TAO/examples/Advanced/ch_18/icp.cpp +++ b/TAO/examples/Advanced/ch_18/icp.cpp @@ -132,7 +132,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- diff --git a/TAO/examples/Advanced/ch_21/icp.cpp b/TAO/examples/Advanced/ch_21/icp.cpp index cc6a4e0213b..8a66d24aba3 100644 --- a/TAO/examples/Advanced/ch_21/icp.cpp +++ b/TAO/examples/Advanced/ch_21/icp.cpp @@ -131,7 +131,6 @@ vary_temp(long temp) if (ACE_OS::rand() % 2) delta = -delta; return temp + delta; - } //---------------------------------------------------------------- diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp index ce50c43b3e6..099bdc5a585 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp index ce50c43b3e6..099bdc5a585 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp @@ -16,6 +16,5 @@ Callback_i::test_method ( ) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called\n")); - } diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 7c32b117b31..675bfedf1e1 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -188,7 +188,6 @@ Notifier_i::shutdown () // Instruct the ORB to shutdown. this->orb_->shutdown (); - } bool diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index ddd0a0d150c..8e8590ea7f5 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -121,7 +121,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id) // Bump down the flags value --this->flags_; - } Load_Balancer::Object_Group_ptr @@ -775,7 +774,6 @@ Object_Group_i::resolve_with_id (const char * id) char *retn_ptr = CORBA::string_dup (ior.in ()); return retn_ptr; - } Load_Balancer::Member_ID_List * diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp index 83fe0565eb7..d85983cd541 100644 --- a/TAO/examples/Logging/Logging_Test.cpp +++ b/TAO/examples/Logging/Logging_Test.cpp @@ -13,5 +13,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; return logger_client.run (); - } diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp index 865adcf7d55..86ce2bd23a2 100644 --- a/TAO/examples/Logging/Logging_Test_i.cpp +++ b/TAO/examples/Logging/Logging_Test_i.cpp @@ -67,7 +67,6 @@ Logger_Client::init (int argc, ACE_TCHAR *argv[]) } return 0; - } int diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp index 584df60e71e..1989bef9b76 100644 --- a/TAO/examples/OBV/Typed_Events/client.cpp +++ b/TAO/examples/OBV/Typed_Events/client.cpp @@ -17,5 +17,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp index a8d3ab80ead..870292aa893 100644 --- a/TAO/examples/Persistent_Grid/client.cpp +++ b/TAO/examples/Persistent_Grid/client.cpp @@ -14,7 +14,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index d1ee3959cec..d5a4439020f 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -229,7 +229,6 @@ DT_Creator::register_synch_obj (void) // Register the synch object with the Synch context. synch_context->rebind (name, synch.in ()); - } @@ -395,7 +394,6 @@ DT_Creator::activate_schedule (void) ACE_DEBUG ((LM_DEBUG, "Activated schedule, task count = %d\n", dt_count_)); - } int diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp index 12fbc8127a2..3a92fd23bc3 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_DT_Creator.cpp @@ -5,7 +5,6 @@ FP_DT_Creator::FP_DT_Creator (void) { DT_TEST::instance ()->dt_creator (this); - } Thread_Task* diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 28563f1378f..ab1c5e2697e 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -76,7 +76,6 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_policy->value (segment_priority); return segment_policy; - } @@ -110,7 +109,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current name, sched_param, implicit_sched_param); - } void @@ -152,7 +150,6 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p sizeof (size_t)); request_info->add_request_service_context (*srv_con, 0); - } void diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index b2a518cb81e..ce90a908d1b 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -16,7 +16,6 @@ Job_i::Job_i (DT_Creator* dt_creator) // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (100); - } Job_i::~Job_i (void) diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index a26d17387d1..ef5323ad388 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -371,7 +371,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ free_que_.enqueue_prio (run_dt); } lock_.release (); - } void diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index d60b0961c97..56b515abfc5 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -23,7 +23,6 @@ MIF_Task::MIF_Task (int importance, // create the stat object. ACE_NEW (task_stats_, Task_Stats); task_stats_->init (iter_); - } MIF_Task::~MIF_Task (void) diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp index 3157582646d..d5e299cc3c2 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp @@ -54,7 +54,6 @@ DOVE_Supplier::~DOVE_Supplier () delete [] this->connection_params_list_; delete internal_DOVE_Supplier_ptr_; - } // Initialize the ORB and the connection to the Name Service @@ -206,7 +205,6 @@ DOVE_Supplier::connect (const char* MIB_name, } return 0; - } @@ -440,7 +438,6 @@ DOVE_Supplier::connect_Supplier () } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp index 6d05f65ede8..b6e3c7877e1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceConsumer_i.cpp @@ -35,7 +35,6 @@ EventSequenceConsumer_i::disconnect_sequence_push_consumer () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id(); poa->deactivate_object(objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp index c47f465d145..e15da52477c 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequenceSupplier_i.cpp @@ -16,7 +16,6 @@ EventSequenceSupplier_i::disconnect_sequence_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp index 8d94d19eff7..0bfc413654b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/MessengerServer.cpp @@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp index 9e0a217a91a..fc0488c9107 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp @@ -116,6 +116,5 @@ CORBA::Boolean Messenger_i::send_message (const char * user_name, consumer_proxy_->push_structured_events(events); return 1; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp index 28e2fb05627..69b8b1bc3b1 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventConsumer_i.cpp @@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer( PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp index a8331596d84..ab5ad740764 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp index 1163e577c31..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp index 11cb57adaf5..97d8865479b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/StructuredEventSupplier_i.cpp @@ -15,7 +15,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp index 6618dcbfce1..d32ac5960fc 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/MessengerClient.cpp @@ -43,7 +43,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[]) std::cout << "MessengerClient: success" << std::endl; return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp index a1c11e2cc82..81b6de4c263 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventConsumer_i.cpp @@ -33,7 +33,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer( PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp index 0c3cf2b94d5..30701f30fbd 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp index e80efb54cee..24dd322ed0d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventConsumer_i.cpp @@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp index b11df7abb34..03dbefa4624 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp index 1163e577c31..d4f1ee8853a 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/MessengerServer.cpp @@ -64,7 +64,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp index e80efb54cee..24dd322ed0d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventConsumer_i.cpp @@ -34,7 +34,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp index 263b4d03d66..159d860a26d 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp index 14e332e2672..c478ac9848b 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp @@ -82,7 +82,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv []) return 1; } return 0; - } diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp index b3d363c0d52..9858d2f7ba8 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventConsumer_i.cpp @@ -32,7 +32,6 @@ StructuredEventConsumer_i::disconnect_structured_push_consumer() PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp index 8cf0e0abd35..a4f57a40858 100644 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp index 6bdd7c6a1de..86ba4505116 100644 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/ClientInterceptor.cpp @@ -84,7 +84,6 @@ ClientInterceptor::send_request ( // reset recursion test flag <<= 0; pic->set_slot(slot,flag); - } void diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h index 2d30ac02884..901816581ff 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h @@ -76,7 +76,6 @@ namespace TAO FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs); }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index 6957f1f39db..b4aa54eb188 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -74,7 +74,6 @@ namespace TAO // Data Members private: }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h index 3e3dd8afe9e..749409d43ab 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -145,7 +145,6 @@ namespace TAO size_t notifications_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index 1298d974555..f23699c8ba5 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -66,7 +66,6 @@ namespace TAO PortableGroup::FactoryInfos_var factories; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index 306b1f23f16..1cbc87839bc 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -75,7 +75,6 @@ namespace TAO //@} }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index da1318e9869..da4c8d6809f 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -401,7 +401,6 @@ namespace TAO /// Quit flag. int quit_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index 70ce7f6ce0c..a7cfd9b7997 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -184,7 +184,6 @@ namespace TAO FT_ReplicationManager * replication_manager_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp index 2c41bddea40..3c244cfdc9e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp @@ -592,7 +592,6 @@ Locator_Repository::link_peers (Server_Info_Ptr base, this->persistent_update (base, true); return 0; - } // ------------------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index 8f06171529d..5084fa7e53a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -895,7 +895,6 @@ Shared_Backing_Store::locator_service_ior (const char* peer_ior) const char* const combined_ior = this->orb_->object_to_string(locator_service.in ()); return combined_ior; - } void diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp index 1887780411e..74ad8a93515 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp @@ -181,7 +181,6 @@ TAO_NT_Naming_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp index a561076517f..cde1f49c6c3 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp @@ -149,7 +149,6 @@ TAO_NT_Notify_Service::arg_manip (char *args, DWORD arglen, bool query) } RegCloseKey (hkey); - } int diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp index 28543b33482..e9e5ff59a93 100644 --- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp +++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp @@ -134,7 +134,6 @@ void TestClient::run() this->wait(); ACE_DEBUG((LM_DEBUG, "* Client ended.\n")); - } // Read in the stringified object references into an array diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp index bc3aa1ea8ea..431cbd63b0a 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -96,7 +96,6 @@ Consumer::push (const CORBA::Any &) ACE_DEBUG ((LM_DEBUG, "Consumer (%P|%t): %d log generated events received\n", this->event_count_)); - } void diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 96e35de1902..805a9900f3e 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h @@ -71,7 +71,6 @@ private: DsNotifyLogAdmin::NotifyLogFactory_var notify_log_factory_; CosNotifyChannelAdmin::ProxyPushSupplier_var proxy_supplier_; - }; #endif /* NOTIFY_CONSUMER_H */ diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp index e288e2e04e0..9c831329b94 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp @@ -17,7 +17,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) Supplier supplier; return supplier.run (argc, argv); - } // **************************************************************** diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp index a6f96cbe249..93cd4e1f219 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp @@ -329,7 +329,6 @@ Subscribe_StructuredPushConsumer::push_structured_event if (++g_result_count == EVENT_COUNT) subscribe_->done (); - } void diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 2a53ea29c8e..6824b4bacf5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -2151,7 +2151,6 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, return 0; return 1; - } // Sets the list of protocols this streamendpoint can understand. @@ -2609,7 +2608,6 @@ TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep { throw AVStreams::notSupported (); - } TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A () diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index ed0f32ee71a..ce63260d5ae 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -259,7 +259,6 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Gets the stream endpoint object reference from the naming service diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index bbe3cfc9108..633df6b7cf2 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -239,7 +239,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; - } // Put the stream_endpoint into the POA diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp index 8848fffcf47..57dfc5fc1e4 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp @@ -167,7 +167,6 @@ TAO_AV_UDP_MCast_Transport::send (const char *buf, // if (TAO_debug_level > 0) ORBSVCS_DEBUG ((LM_DEBUG,"to %s\n",addr)); return this->handler_->get_mcast_socket ()->send (buf, len); - } ssize_t @@ -178,7 +177,6 @@ TAO_AV_UDP_MCast_Transport::send (const iovec *iov, return this->handler_->get_mcast_socket ()->send (iov, iovcnt, 0); - } int diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp index 4d3a2c5dc31..9d3baefcc29 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp @@ -180,7 +180,6 @@ TAO_AV_UDP_QoS_Session_Helper::activate_qos_handler (ACE_QoS_Session *qos_sessio -1); return 0; - } TAO_AV_UDP_QoS_Flow_Handler::TAO_AV_UDP_QoS_Flow_Handler (void) @@ -1066,7 +1065,6 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr) this->entry_->handler (flow_handler); return 0; - } int diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp index 0001e862225..d2d5b191171 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp @@ -436,7 +436,6 @@ TAO_AV_RTCP_Object::TAO_AV_RTCP_Object (TAO_AV_Callback *client_cb, { rtcp_cb = &this->rtcp_cb_; this->client_cb_ = client_cb; - } TAO_AV_RTCP_Object::~TAO_AV_RTCP_Object () diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp index 9423eef309a..3cc42ab145d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp @@ -66,7 +66,6 @@ RTCP_Packet::is_valid (char is_first) } return 1; - } /* diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp index d320d327028..ee9d4f7a4b6 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp @@ -280,7 +280,6 @@ TAO_AV_UDP_Transport::send (const iovec *iov, return this->handler_->get_socket ()->send ((const iovec *) iov, iovcnt, this->peer_addr_); - } ssize_t diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 77b9e1542a7..28dc0972ce7 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -649,7 +649,6 @@ TAO_SFP_Base::send_message (TAO_AV_Transport *transport, return -1; } return 1; - } int diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp index 855026457a8..b07c2c26bc3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp @@ -170,7 +170,6 @@ TAO_ECG_CDR_Message_Sender::send_message (const TAO_OutputCDR &cdr, } // ACE_ASSERT (total_length == fragment_offset); // ACE_ASSERT (fragment_id == fragment_count); - } diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp index 3768edc213e..444d5e710c3 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp @@ -215,7 +215,6 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q buf, qos.publications[i].dependency_info.number_of_calls)); } ORBSVCS_DEBUG ((LM_DEBUG, "}\n")); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp index fd5333e870b..e1b6e9e36fd 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp @@ -64,7 +64,6 @@ TAO_FT_IOGR_Property::set_property ( // Success return 1; - } @@ -139,7 +138,6 @@ TAO_FT_IOGR_Property::get_primary ( stub = safe_stub.release (); return new_obj._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h index 0627ab902c4..6a2392367b5 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h @@ -100,7 +100,6 @@ namespace TAO CORBA::ORB_var orb_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp index 2e87871cfb0..9133eee20a7 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp @@ -82,7 +82,6 @@ TAO_FT_Service_Callbacks::object_is_nil (CORBA::Object_ptr obj) // If it reaches here then it should be nill return true; - } TAO_Service_Callbacks::Profile_Equivalence diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index c077a85b344..a86235cd2a5 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -270,7 +270,6 @@ TAO_FTEC_Event_Channel::connect_push_supplier ( ) { return ec_impl_->connect_push_supplier(push_supplier, qos); - } void diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp index e845ed7d35f..932beb8d789 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp @@ -187,7 +187,6 @@ TAO_FTEC_Event_Channel_Impl::TAO_FTEC_Event_Channel_Impl( CORBA::Object::_duplicate (attributes.scheduler); this->create_strategies (); - } TAO_FTEC_Event_Channel_Impl::~TAO_FTEC_Event_Channel_Impl() diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 50943253f93..bcdc0daaf3d 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -96,7 +96,6 @@ retrieve_ft_request_context( if ((cdr >> ft_request_service_context) == 0) throw CORBA::BAD_PARAM (); - } FTRT::TransactionDepth diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp index f146aa999f0..6308a9fb6ed 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp @@ -104,7 +104,6 @@ Request_Context_Repository::get_object_id( CORBA::Any_var a = ri->get_slot(object_id_slot); return ::get_object_id(a); - } void @@ -235,7 +234,6 @@ Request_Context_Repository::get_transaction_depth( FTRT::TransactionDepth result=0; a >>= result; return result; - } FTRT::TransactionDepth @@ -249,7 +247,6 @@ Request_Context_Repository::get_transaction_depth() FTRT::TransactionDepth result=0; a >>= result; return result; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp index abe63a47620..1c437dd30ae 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp @@ -311,7 +311,6 @@ TAO::HTIOP::Connector::cancel_svc_handler ( return 0; return -1; - } diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp index b0b30c1bf4b..7db2db3649d 100644 --- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp @@ -34,7 +34,6 @@ TAO_BasicLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -50,7 +49,6 @@ TAO_BasicLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp index 6ede219f2e6..1929ea3e2be 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp @@ -48,7 +48,6 @@ TAO_EventLog_i::copy (DsLogAdmin::LogId &id) this->copy_attributes (log.in ()); return log._retn (); - } DsLogAdmin::Log_ptr @@ -64,7 +63,6 @@ TAO_EventLog_i::copy_with_id (DsLogAdmin::LogId id) this->copy_attributes (log.in ()); return log._retn (); - } diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp index 9d46942ca69..ef709e6d6c9 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp @@ -34,7 +34,6 @@ TAO_Notify_LogConsumer::connect ( ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ())); proxy_supplier_->connect_any_push_consumer (objref.in ()); - } void diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp index 05a80e20651..ec3195f1a1f 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp @@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global } global.counter(counter); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp index e83ee24703b..d369a3af82e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp @@ -62,7 +62,6 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent* parent) this->proxy_container_.reset (proxy_container); this->proxy_container().init (); - } void diff --git a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h index 4ae02ec2e94..0f5218fee01 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h @@ -69,7 +69,6 @@ private: size_t first_set_bit_; size_t first_cleared_bit_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h index 1117bda47e9..ec73cc7a992 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h @@ -120,7 +120,6 @@ private: ACE_CDR::Octet delivery_type_; IdVec destination_id_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp index eb9881eb2e9..7040b2eb878 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp @@ -29,7 +29,6 @@ TAO_Notify_ETCL_FilterFactory::~TAO_Notify_ETCL_FilterFactory () } this->filters_.unbind_all (); - } CosNotifyFilter::FilterFactory_ptr diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp index cb8d189001d..6dfd2180884 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp @@ -140,7 +140,6 @@ bool TAO_Notify_EventType::init(const TAO_Notify::NVPList& attrs) result = true; } return result; - } // TAO_Notify::Topology_Object diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h index f10ddea24a5..c2207438b3f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h @@ -39,7 +39,6 @@ namespace TAO_Notify // release the current factory so a new one can be created virtual void reset () = 0; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp index 264f4ede97c..30af7a40e46 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp @@ -155,7 +155,6 @@ TAO_Notify_Method_Request_Lookup::unmarshal ( } } return result; - } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp index 316f93a140a..72564775ee2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp @@ -29,7 +29,6 @@ Persistent_Storage_Block::Persistent_Storage_Block(const size_t block_number, { ACE_NEW(this->data_, unsigned char[this->block_size_]); ACE_OS::memset(this->data_, 0, this->block_size_); - } Persistent_Storage_Block::Persistent_Storage_Block( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h index d6b32f7d70c..3ac466ff73c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h @@ -197,7 +197,6 @@ private: bool thread_active_; ACE_SYNCH_CONDITION wake_up_thread_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h index 4eefacf39be..7270b9264a0 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h @@ -83,7 +83,6 @@ private: size_t block_size_; mutable TAO_SYNCH_MUTEX lock_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h index e32670b14f3..9fe228cb5a1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h @@ -232,7 +232,6 @@ private: static Routing_Slip_Queue persistent_queue_; }; - } // namespace TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h index c458f30d069..8354304bef2 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h @@ -255,7 +255,6 @@ private: ACE_Message_Block * event_mb_; ACE_Message_Block * routing_slip_mb_; }; - } /* namespace TAO_Notify */ TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp index 8b394884503..8f26f9e0280 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.cpp @@ -27,7 +27,6 @@ TAO_Notify_Seq_Worker_T<TYPE>::create (CONTAINER &container) container.collection ()->for_each (this); return this->seq_._retn (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h index def15cc2749..71e6af692ff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h @@ -71,7 +71,6 @@ public: */ virtual void close (void); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h index de3803bc12b..6afb55621ab 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h @@ -200,7 +200,6 @@ namespace TAO_Notify /// \return false if save will never happen bool child_change (void); }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h index 76094b30928..b4d535c045e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h @@ -71,7 +71,6 @@ private: /// If false, then we're just checking syntax of topology file. bool live_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h index 32479952dd9..de945ca731a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h @@ -73,7 +73,6 @@ private: /// A string consisting of spaces that is our current indentation level. ACE_CString indent_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h index a567b11a3ac..952862c35a7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h @@ -72,7 +72,6 @@ namespace TAO_Notify size_t backup_count_; bool timestamp_; }; - } // namespace TAO_Notify TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h index adec27c6573..d8bd18cf11c 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Fragments_Cleanup_Strategy.h @@ -99,7 +99,6 @@ namespace TAO_PG virtual void cleanup (TAO_UIPMC_Mcast_Transport::Packets_Map &packets); }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h index fc271b1cbb5..afea09a6227 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h @@ -34,7 +34,6 @@ namespace TAO static int Requires_MIOP_Initializer = MIOP_Loader::Initializer (); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp index f5c57843388..5364b87d4ea 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp @@ -169,7 +169,6 @@ void TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr // and create a ior string this->ior_ = this->orb_->object_to_string (this->this_obj_.in ()); - } int TAO::PG_FactoryRegistry::init (CORBA::ORB_ptr orb) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp index a13f035b279..45bf7719256 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp @@ -358,7 +358,6 @@ TAO::PG_Group_Factory::set_object_group_storable_factory ( ACE_NEW_THROW_EX (this->list_store_, TAO::PG_Group_List_Store (*this->storable_factory_), CORBA::NO_MEMORY ()); - } TAO::PG_Group_Factory::Group_Map & diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 72065e982b1..b1ffb6120b6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -74,7 +74,6 @@ TAO_PG_ObjectGroupManager::add_member ( the_location, member, check_type_id); - } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h index 9c8cb300bca..e40ce9263d4 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h @@ -83,7 +83,6 @@ namespace TAO_PG private: NamedValueVec values_; }; - } //namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h index 5df8e585c27..c4d6577eabc 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h @@ -46,7 +46,6 @@ namespace TAO_PG TAO_PortableGroup_Export void override_properties ( const PortableGroup::Properties & overrides, PortableGroup::Properties &properties); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h index 821082e9cda..8d29cc82746 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport_Recv_Packet.h @@ -97,7 +97,6 @@ namespace TAO_PG ACE_SYNCH_NULL_MUTEX> Fragments_Map; Fragments_Map fragments_; }; - } // namespace TAO_PG TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h index 553d7f7f777..548efc4572d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h @@ -101,7 +101,6 @@ namespace TAO bool setup_done_; }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h index 8039af21ac4..e788d7e538d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h @@ -88,7 +88,6 @@ namespace TAO /// The connector initiating connection requests for IIOP_SSL. BASE_CONNECTOR base_connector_; }; - } // End TAO namespace. TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp index be7540ea0a6..35b27ccfeb3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp @@ -31,7 +31,6 @@ TAO::SSLIOP::OwnCredentials_ptr TAO::SSLIOP::OwnCredentials::_nil () { return (OwnCredentials *) 0; - } SecurityLevel3::CredentialsType diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp index fee14157da2..c9e1b13d171 100644 --- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp @@ -1856,7 +1856,6 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende number_of_calls, dependency_type, enabled); - } diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp index 7c990e8f968..2d4d423f49e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp @@ -677,7 +677,6 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en ACE_OS::fclose (file); return 0; - } void diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 2f20367d331..ec1cd67695e 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -177,7 +177,6 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // For now we just return the default. return access_decision; - } CORBA::Boolean diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index a1f9556ebb6..001dd340523 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -111,7 +111,6 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( } throw CORBA::BAD_PARAM (); - } SecurityLevel3::OwnCredentialsList * diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index e04a1d22fcd..15a3da0fa7a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -583,7 +583,6 @@ Connection_Manager::destroy (const ACE_CString &flowname) this->receivers_.unbind (flowname); this->streamctrls_.unbind (flowname ); - } Connection_Manager::Receivers & diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 535b16c0b06..459ccf9fa56 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -127,7 +127,6 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo } return true; - } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 49d8fc18d9b..aa0dcd94807 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -71,7 +71,6 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows } return 1; - } Receiver_Callback::Receiver_Callback (void) diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index 2a384f91291..9af75d01c61 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -181,7 +181,6 @@ Client::Client (void) protocol_ (ACE_OS::strdup ("UDP")) { endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); - } diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 805b34997c8..4b74dfdff1c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -60,7 +60,6 @@ Sender::shutdown (void) // Shut the orb down. TAO_AV_CORE::instance ()->orb ()->shutdown (0); - } int diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index 76f54988e36..562a0c7b7f3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -101,5 +101,4 @@ protected: /// Receiver MMDevice. TAO_MMDevice *mmdevice_; - }; diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp index 9c9670f5b46..f9ea2ede22a 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp @@ -20,7 +20,6 @@ Server_ORBInitializer::post_init ( { this->register_server_request_interceptors (info ); - } void @@ -40,7 +39,6 @@ Server_ORBInitializer::register_server_request_interceptors ( info->add_server_request_interceptor (server_interceptor.in () ); - } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp index b23dc33a54e..632ebfabf87 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp @@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[]) } return 0; - } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index d17f53abbe8..4b49e5f9559 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp @@ -121,6 +121,5 @@ CORBA::Boolean Messenger_i::send_message ( consumer_proxy_->push_structured_event(event); return 1; - } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp index b11df7abb34..03dbefa4624 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp @@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier () PortableServer::POA_var poa = current->get_POA (); PortableServer::ObjectId_var objectId = current->get_object_id (); poa->deactivate_object (objectId.in()); - } void diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp index c1b275f824f..d1ee5370765 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp @@ -70,5 +70,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 685fcba8db5..9473b645f16 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -380,7 +380,6 @@ Test_Consumer::connect (int event_a, this->supplier_proxy_->connect_push_consumer (objref.in (), qos.get_ConsumerQOS ()); - } void diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 898287edee4..4723d3c58b0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -102,7 +102,6 @@ EC_Schedule::execute_test (void) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Schedule (%P|%t) schedule dumped\n")); - } void diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index a48b544a703..939f3218210 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -47,7 +47,6 @@ EC_Counting_Consumer::deactivate (void) PortableServer::ObjectId_var consumer_id = consumer_poa->servant_to_id (this); consumer_poa->deactivate_object (consumer_id.in ()); - } void diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index a97beb2f677..086662e4d48 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -331,7 +331,6 @@ EC_Driver::deactivate_ec (void) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n")); - } void diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h index 4ff32c986ca..131f9e30512 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h @@ -106,7 +106,6 @@ namespace FTAPP }; - } // namespace TAO #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h index 4a2acdef8fc..3c5a3bab53d 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h @@ -96,7 +96,6 @@ namespace TAO */ int have_replication_manager_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp index b2a7b5e77dd..4276d42ff26 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -146,7 +145,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -200,7 +198,6 @@ LB_server::create_object_group (const char *group_name) } return 0; - } int @@ -265,7 +262,6 @@ LB_server::remove_servant (const char *loc) } return 0; - } TAO_Naming_Client& diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index 25323e14cad..d01246bfada 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -473,7 +473,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return rc; - } //============================================================================== @@ -1324,7 +1323,6 @@ do_persistence_name_test ( } return RC_SUCCESS; - } diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp index 603eb0086e8..b51bfac2a0d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -144,7 +143,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -186,7 +184,6 @@ LB_server::create_object_group (void) } return 0; - } int diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp index 88418d36e0c..4d2423caf54 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp @@ -676,5 +676,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 0; - } diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp index 2e9fb65c602..17231082463 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp @@ -27,7 +27,6 @@ LB_server::destroy (void) return -1; } return 0; - } CORBA::ORB_ptr @@ -142,7 +141,6 @@ LB_server::start_orb_and_poa (void) } return 0; - } int @@ -217,7 +215,6 @@ LB_server::create_object_group (void) } return 0; - } int diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 159b2cbcd5c..0d49d05f636 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -74,7 +74,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel) -1); return 0; - } diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index 8c8247294ea..283eaaf36c0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -63,7 +63,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts ( throw ::CORBA::TRANSIENT ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1), CORBA::COMPLETED_NO); - } void diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp index 524455780c1..2d6e14f416a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp @@ -34,5 +34,4 @@ Test_i::abort (CORBA::Short delay_secs) ACE_NEW(mb, ACE_Message_Block(2)); ACE_OS::sprintf(mb->wr_ptr (), "%d", delay_secs); terminator_.putq(mb); - } diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index d2ab16ff3a5..0afb62d3c28 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -138,7 +138,6 @@ NContextExt_Client_i::get_name () *name_componentPtr = '\0'; return name_component; - } int @@ -321,5 +320,4 @@ NContextExt_Client_i::print_values (CosNaming::Name name, ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %C\n"), url_string.in ())); - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index b269b4cd18a..78b94429c09 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -29,7 +29,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -135,7 +134,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -178,7 +176,6 @@ LB_server::create_object_group (void) } return 1; - } int diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp index 86eb6d82c58..88dac29fa65 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp @@ -36,7 +36,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -117,7 +116,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -157,7 +155,6 @@ LB_server::create_object_group (void) } return 1; - } @@ -176,7 +173,6 @@ LB_server::get_object_group (void) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp index cef4b099a21..5a9c2c5027b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp @@ -44,7 +44,6 @@ LB_Factory_Server::run (void) return -1; } return 1; - } @@ -66,7 +65,6 @@ LB_Factory_Server::destroy (void) return -1; } return 1; - } int @@ -195,6 +193,5 @@ LB_Factory_Server::init (void) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp index 6febfc8546c..53262b5b65e 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp @@ -45,7 +45,6 @@ LB_server::run (void) return -1; } return 1; - } @@ -67,7 +66,6 @@ LB_server::destroy (void) return -1; } return 1; - } int @@ -169,7 +167,6 @@ LB_server::init (void) } return 1; - } int @@ -270,5 +267,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 8c7b5ca40c2..135e228f1ef 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -51,7 +51,6 @@ Factory::create_object ( this->oid_ = this->poa_->servant_to_id (servant); return servant->_this (); - } void diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index 6150e701400..c1fe0ef575c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -35,7 +35,6 @@ LB_server::run (void) return -1; } return 1; - } @@ -57,7 +56,6 @@ LB_server::destroy (void) return -1; } return 1; - } int @@ -146,7 +144,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -242,5 +239,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2) } return 1; - } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp index ea93044934d..6433cb05cc7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp @@ -31,7 +31,6 @@ LB_server::destroy (void) return -1; } return 1; - } CORBA::ORB_ptr @@ -100,7 +99,6 @@ LB_server::start_orb_and_poa (void) } return 1; - } int @@ -139,7 +137,6 @@ LB_server::create_basic_object_group (void) } return 1; - } int @@ -178,7 +175,6 @@ LB_server::create_simple_object_group (void) } return 1; - } int diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index d59481f87cd..370cffe3c23 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -55,7 +55,6 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) } ACE_RETURN(0); - } int @@ -249,7 +248,6 @@ int BasicLog_Test::display_records () rec_list[j].id, rec_list[j].time)); return 0; - } */ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords) @@ -711,5 +709,4 @@ BasicLog_Test::test_capacity_alarm_threshold (void) this->write_records (0); return 0; - } diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 26893522ce8..753ac74d846 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -108,7 +108,6 @@ IdAssignment::init (int argc, CosNotifyChannelAdmin::EventChannelFactory::_narrow ( obj.in() ); - } CosNotifyChannelAdmin::ChannelID diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 31b9baac697..e67251706c4 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -1560,7 +1560,6 @@ Consumer_Main::init_sequence_proxy_supplier (void) this->sequence_proxy_push_supplier_->connect_sequence_push_consumer ( this->sequence_push_consumer_ref_.in ()); this->sequence_push_consumer_.set_connected(true); - } diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 3b89f49dbcc..071e9000daf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -126,7 +126,6 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void) LOOKUP_MANAGER->resolve (driver); driver->shutdown (); - } void diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 6d6c95ac717..6ff51a9ec3e 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -536,5 +536,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // All tests have passed up to this point return 0; - } diff --git a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp index 0667989e650..716791e92cf 100644 --- a/TAO/performance-tests/Latency/Collocation/Client_Task.cpp +++ b/TAO/performance-tests/Latency/Collocation/Client_Task.cpp @@ -77,5 +77,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index afb4acfe869..af93d374f5f 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -41,5 +41,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } return 0; - } diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 5d4a632fc5a..6a1d8bc2e49 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -118,7 +118,6 @@ Demux_Test_Client::init (int argc, ACE_TCHAR *argv []) // success return 0; - } // parse command line arguments (if any). diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 7f8ee4a8c99..57c870b65a7 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -320,7 +320,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv []) // success return 0; - } // parse command line arguments (if any). diff --git a/TAO/tao/AnyTypeCode/ExceptionA.h b/TAO/tao/AnyTypeCode/ExceptionA.h index 8a36f21990e..91ffbc797db 100644 --- a/TAO/tao/AnyTypeCode/ExceptionA.h +++ b/TAO/tao/AnyTypeCode/ExceptionA.h @@ -35,7 +35,6 @@ namespace CORBA TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::Exception &); TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Exception *); - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 438b7aa9af3..f75b9528642 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -71,7 +71,6 @@ namespace TAO void remove_ref () { } }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 9a1cdb999f3..45b27e67042 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -101,7 +101,6 @@ namespace TAO /// Reference counter. std::atomic<uint32_t> refcount_; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index ccf178f9ed6..58d084a3147 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -169,7 +169,6 @@ namespace ACE return p->clone (); } }; - } // End namespace ACE. ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp index da113fb0934..ae503abbf8c 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp @@ -101,7 +101,6 @@ namespace CORBA TypeCode_ptr const _tc_Object = &TAO::TypeCode::tc_Object; TypeCode_ptr const _tc_Component = &TAO::TypeCode::tc_Component; TypeCode_ptr const _tc_Home = &TAO::TypeCode::tc_Home; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/WrongTransactionA.h b/TAO/tao/AnyTypeCode/WrongTransactionA.h index ea41d49874c..700eaa9228f 100644 --- a/TAO/tao/AnyTypeCode/WrongTransactionA.h +++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h @@ -82,7 +82,6 @@ TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransac TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&); - } // TAO_IDL - Generated from // be\be_codegen.cpp:955 diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 33a79646a44..0548ea6b6c0 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -87,7 +87,6 @@ struct array_traits copy_range(begin, end, dst); } }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ada4e29eacb..5d2c3fd03fa 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -134,7 +134,6 @@ namespace TAO public: void operator() (TAO_Asynch_Reply_Dispatcher_Base *ardb) throw (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bounded_Array_Allocation_Traits_T.h b/TAO/tao/Bounded_Array_Allocation_Traits_T.h index 67c7178021c..0af577b1c05 100644 --- a/TAO/tao/Bounded_Array_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Array_Allocation_Traits_T.h @@ -48,7 +48,6 @@ struct bounded_array_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Bounded_Object_Reference_Sequence_T.h b/TAO/tao/Bounded_Object_Reference_Sequence_T.h index 1f3c7d0d577..73194873d13 100644 --- a/TAO/tao/Bounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Bounded_Object_Reference_Sequence_T.h @@ -111,7 +111,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h index 444258197ac..39bfe8d1e20 100644 --- a/TAO/tao/Bounded_Reference_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Reference_Allocation_Traits_T.h @@ -63,7 +63,6 @@ struct bounded_reference_allocation_traits return MAX; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Bounded_Value_Allocation_Traits_T.h b/TAO/tao/Bounded_Value_Allocation_Traits_T.h index 05ac63153a0..06cfd2a7102 100644 --- a/TAO/tao/Bounded_Value_Allocation_Traits_T.h +++ b/TAO/tao/Bounded_Value_Allocation_Traits_T.h @@ -54,7 +54,6 @@ struct bounded_value_allocation_traits } /* static CORBA::ULong const MAXIMUM = MAX; */ }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Bounded_Value_Sequence_T.h b/TAO/tao/Bounded_Value_Sequence_T.h index a9e620aa42a..e5498456b2e 100644 --- a/TAO/tao/Bounded_Value_Sequence_T.h +++ b/TAO/tao/Bounded_Value_Sequence_T.h @@ -102,7 +102,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp index 16f3cd0d2ac..4f47a615460 100644 --- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp +++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp @@ -470,7 +470,6 @@ TAO_UTF16_BOM_Translator::write_wchar_array_i (ACE_OutputCDR & cdr, sb[i] = static_cast<ACE_UTF16_T> (x[i]); } return 1; - } ACE_CDR::Boolean diff --git a/TAO/tao/Codeset_Manager_Factory_Base.cpp b/TAO/tao/Codeset_Manager_Factory_Base.cpp index 7da0ba9288a..f616c6bb4cf 100644 --- a/TAO/tao/Codeset_Manager_Factory_Base.cpp +++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp @@ -15,7 +15,6 @@ TAO_Codeset_Manager * TAO_Codeset_Manager_Factory_Base::create () { return nullptr; - } int diff --git a/TAO/tao/DynamicAny/DynValueBox_i.cpp b/TAO/tao/DynamicAny/DynValueBox_i.cpp index 4b522011808..cfa81bd3bea 100644 --- a/TAO/tao/DynamicAny/DynValueBox_i.cpp +++ b/TAO/tao/DynamicAny/DynValueBox_i.cpp @@ -66,7 +66,6 @@ TAO_DynValueBox_i::init (CORBA::TypeCode_ptr tc) this->init_common (); this->set_to_null (); - } void diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp index 63273b603f7..e43a483fcd6 100644 --- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp +++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp @@ -72,7 +72,6 @@ TAO_DTP_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info) "DTP_Thread_Lane_Resources_Manager_Factory"); ACE_Service_Config::process_directive ( ace_svc_desc_TAO_DTP_Thread_Lane_Resources_Manager_Factory); - } void diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp index dcc2530d7ae..459a8cdb076 100644 --- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp +++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp @@ -109,7 +109,6 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core) } return (this->dtp_task_.open () == 0); - } void diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp index 636c345d7da..4fcd243675b 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Lane_Resources_Manager.cpp @@ -25,7 +25,6 @@ TAO_DTP_Thread_Lane_Resources_Manager::TAO_DTP_Thread_Lane_Resources_Manager // Create the thread-pool manager. ACE_NEW (this->tp_manager_, TAO_DTP_Thread_Pool_Manager (orb_core)); - } TAO_DTP_Thread_Lane_Resources_Manager::~TAO_DTP_Thread_Lane_Resources_Manager (void) diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp index 852e4862245..9be23601da7 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp @@ -496,7 +496,6 @@ TAO_DTP_Thread_Pool_Manager::destroy_threadpool (CORBA::ULong threadpool) // Delete the thread pool. delete tao_thread_pool; - } CORBA::ULong diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index 3d5efa6a49d..6243f4ae2e5 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -86,7 +86,6 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( params.locate_reply_status (static_cast <GIOP::LocateStatusType> (locate_reply_status)); return 0; - } bool diff --git a/TAO/tao/HTTP_Client.cpp b/TAO/tao/HTTP_Client.cpp index 80938aac971..d353a5a5820 100644 --- a/TAO/tao/HTTP_Client.cpp +++ b/TAO/tao/HTTP_Client.cpp @@ -43,7 +43,6 @@ TAO_HTTP_Client::read (ACE_Message_Block *mb) } return ACE_Utils::truncate_cast<int> (HTTP_reader.byte_count ()); - } int diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp index 87d6184c7a2..6469ed1bf9e 100644 --- a/TAO/tao/HTTP_Handler.cpp +++ b/TAO/tao/HTTP_Handler.cpp @@ -43,7 +43,6 @@ TAO_HTTP_Handler::open (void *) if (this->receive_reply () != 0) TAOLIB_ERROR_RETURN ((LM_ERROR, "TAO (%P|%t) - HTTP_Handler::open, receive_reply failed\n"), -1); return 0; - } int diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index 5129206e778..4f171c079f8 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -34,7 +34,6 @@ TAO_IIOP_Connection_Handler::add_reference (void) rc)); } return rc; - } ACE_Event_Handler::Reference_Count diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h index f07c884b168..7f9a2a053fc 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.h +++ b/TAO/tao/IORTable/Locate_ResponseHandler.h @@ -134,7 +134,6 @@ namespace IORTable { // satisfy the native type requirement for the asnyc locate interface typedef const TAO_AMH_Locate_ResponseHandler_var &Locate_ResponseHandler; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index 0e1b3a07d31..827388228e7 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -89,7 +89,6 @@ namespace TAO public: virtual CORBA::ValueBase * create_for_unmarshal (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index 5763da6b776..3d5b0415120 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -174,7 +174,6 @@ namespace TAO private: ::TAO_ORB_Core * core_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/ORB_Time_Policy.h b/TAO/tao/ORB_Time_Policy.h index 9c8a8ee4fe7..4ecf73e2b12 100644 --- a/TAO/tao/ORB_Time_Policy.h +++ b/TAO/tao/ORB_Time_Policy.h @@ -52,7 +52,6 @@ namespace TAO // Declare a countdown timer type based on ORB time policy typedef ACE_Countdown_Time_T<ORB_Time_Policy> ORB_Countdown_Time; - } // TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h index 31f3aa3226e..c1ee3742cab 100644 --- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h @@ -75,7 +75,6 @@ private: value_type const * const element_; CORBA::Boolean const release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index 08e283e91e7..0a5d309ae01 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -126,7 +126,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Object_Reference_Traits_Base_T.h b/TAO/tao/Object_Reference_Traits_Base_T.h index 74b1f4dd490..6cd26d29ed5 100644 --- a/TAO/tao/Object_Reference_Traits_Base_T.h +++ b/TAO/tao/Object_Reference_Traits_Base_T.h @@ -45,7 +45,6 @@ struct object_reference_traits_base return nil(); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h index 8e30e2ed591..6188ac697d7 100644 --- a/TAO/tao/Object_Reference_Traits_T.h +++ b/TAO/tao/Object_Reference_Traits_T.h @@ -83,7 +83,6 @@ struct object_reference_traits typedef object_type const * const_value_type; typedef object_t_var object_type_var; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index f2948962121..7ef14aae70b 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -239,7 +239,6 @@ namespace TAO /// The number of elements in the @c exceptions_ array. CORBA::ULong const nexceptions_; }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h index 7d80c642ebf..2cec9553697 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h @@ -60,7 +60,6 @@ namespace TAO size_t op_len, TAO::Collocation_Strategy strategy); }; - } // End namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index ed4e5f5d052..181c9ef5102 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -93,7 +93,6 @@ namespace TAO typedef ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*> ORT_Array; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 24f66407de2..ae34add8165 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -118,7 +118,6 @@ namespace PortableServer /// Compare two Servant_vars for non-equivalence. template <class X, class Y> bool operator!=(Servant_var<X> const & x, Servant_var<Y> const & y); - } // namespace PortableServer TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp index 9902218d076..3506b34c9a8 100644 --- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp +++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp @@ -63,7 +63,6 @@ TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core) TAO_OBJID_RTCURRENT); this->current_ = RTCORBA::Current::_narrow (object.in ()); - } RTCORBA::ProtocolProperties_ptr diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp index fa7a572ad1f..59fc11aec4f 100644 --- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp +++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp @@ -24,7 +24,6 @@ TAO_RT_Thread_Lane_Resources_Manager::TAO_RT_Thread_Lane_Resources_Manager (TAO_ // Create the thread-pool manager. ACE_NEW (this->tp_manager_, TAO_Thread_Pool_Manager (orb_core)); - } TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (void) diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp index 241f24e2501..4f7653dc8fd 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.cpp +++ b/TAO/tao/RTCORBA/Thread_Pool.cpp @@ -819,7 +819,6 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool) // Delete the thread pool. delete tao_thread_pool; - } RTCORBA::ThreadpoolId diff --git a/TAO/tao/Range_Checking_T.h b/TAO/tao/Range_Checking_T.h index 31eead48256..747602686b8 100644 --- a/TAO/tao/Range_Checking_T.h +++ b/TAO/tao/Range_Checking_T.h @@ -143,7 +143,6 @@ struct range_checking throw CORBA::BAD_PARAM (); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 2216712d8a4..c2b7cb5287b 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -55,7 +55,6 @@ TAO_UIOP_Acceptor::create_profile (const TAO::ObjectKey &object_key, return this->create_shared_profile (object_key, mprofile, priority); - } int diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index d0a2d3c9f1d..792431d82ce 100644 --- a/TAO/tao/String_Const_Sequence_Element_T.h +++ b/TAO/tao/String_Const_Sequence_Element_T.h @@ -70,7 +70,6 @@ private: const_value_type const * element_; CORBA::Boolean const release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index 1905bba57ad..b749ae10434 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -139,7 +139,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/String_Traits_Base_T.h b/TAO/tao/String_Traits_Base_T.h index 3f6b63454e1..fde366464c3 100644 --- a/TAO/tao/String_Traits_Base_T.h +++ b/TAO/tao/String_Traits_Base_T.h @@ -101,7 +101,6 @@ struct string_traits_base<CORBA::WChar> return CORBA::wstring_alloc (len); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h index d34fb03b959..ca45b9ef367 100644 --- a/TAO/tao/String_Traits_T.h +++ b/TAO/tao/String_Traits_T.h @@ -77,7 +77,6 @@ struct string_traits , public string_traits_decorator<charT,string_traits<charT,dummy> > { }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index d7fdc168986..da33bba0612 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -186,7 +186,6 @@ namespace TAO Invocation_Base * const invocation_; Invocation_Status status_; }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h index 16d9c9a8382..27ff7275728 100644 --- a/TAO/tao/Unbounded_Array_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Array_Allocation_Traits_T.h @@ -48,7 +48,6 @@ struct unbounded_array_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h index cbbb8a59336..5806cdbdad2 100644 --- a/TAO/tao/Unbounded_Object_Reference_Sequence_T.h +++ b/TAO/tao/Unbounded_Object_Reference_Sequence_T.h @@ -109,7 +109,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index 5784b3b30c8..dc7a3bf1053 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -311,7 +311,6 @@ private: mutable CORBA::Boolean release_; ACE_Message_Block* mb_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h index 518e876a26a..be46e593cae 100644 --- a/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Reference_Allocation_Traits_T.h @@ -77,7 +77,6 @@ struct unbounded_reference_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h index ac23b74cad0..1c35d77d422 100644 --- a/TAO/tao/Unbounded_Value_Allocation_Traits_T.h +++ b/TAO/tao/Unbounded_Value_Allocation_Traits_T.h @@ -48,7 +48,6 @@ struct unbounded_value_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Unbounded_Value_Sequence_T.h b/TAO/tao/Unbounded_Value_Sequence_T.h index 3d6893254a3..2d268a1ba39 100644 --- a/TAO/tao/Unbounded_Value_Sequence_T.h +++ b/TAO/tao/Unbounded_Value_Sequence_T.h @@ -91,7 +91,6 @@ public: private: implementation_type impl_; }; - } // namespace TAO TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index a23af1296cf..ee49bb2298d 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -71,7 +71,6 @@ namespace CORBA /// Default constructor. UserException (); }; - } TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index 91a253774ca..fe36defb092 100644 --- a/TAO/tao/Value_Traits_T.h +++ b/TAO/tao/Value_Traits_T.h @@ -60,7 +60,6 @@ struct value_traits copy_range(begin, end, dst); } }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h index 9a5027d8624..3e741a98488 100644 --- a/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h +++ b/TAO/tao/Valuetype/Bounded_Valuetype_Allocation_Traits_T.h @@ -63,7 +63,6 @@ struct bounded_valuetype_allocation_traits return MAX; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h index e080b743554..8ba8125d052 100644 --- a/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h +++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Allocation_Traits_T.h @@ -69,7 +69,6 @@ struct unbounded_valuetype_allocation_traits delete[] buffer; } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index ddfafde6f4c..3c59c8b833d 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -70,7 +70,6 @@ namespace CORBA /// Reference counter. std::atomic<uint32_t> refcount_; }; - } // End CORBA namespace namespace TAO diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h index b51a05f0770..c7de0ff8594 100644 --- a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h +++ b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h @@ -116,7 +116,6 @@ private: value_type * element_; CORBA::Boolean release_; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h index 6cceaca1a26..3ede77ef507 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h @@ -46,7 +46,6 @@ struct valuetype_traits_base return nil(); } }; - } // namespace details } // namespace TAO diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h index 2e9e581b4b6..5899f30e0ab 100644 --- a/TAO/tao/Valuetype/Valuetype_Traits_T.h +++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h @@ -82,7 +82,6 @@ struct valuetype_traits typedef object_type const * const_value_type; typedef object_t_var object_type_var; }; - } // namespace details } // namespace CORBA diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 0d9904744fc..19d263e57b2 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -81,5 +81,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp index 9cccd8429bc..f3b4230cd4c 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.cpp +++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp @@ -142,7 +142,6 @@ ArrayTest_i::~ArrayTest_i (void) // Add your implementation here ::CharArray_copy(p3,p2); return CharArray_dup(p1); - } ::OctetArray_slice * ArrayTest_i::octetArrayOp ( diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp index 419c8e44bbb..511b3d75bac 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp @@ -57,5 +57,4 @@ Client_Task::svc (void) ACE_ERROR ((LM_ERROR, "(ERROR: Client_Task::svc Expected exception not received\n")); } return 0; - } diff --git a/TAO/tests/Bug_2804_Regression/client.cpp b/TAO/tests/Bug_2804_Regression/client.cpp index 9cdf85c1e6f..d852e043aa6 100644 --- a/TAO/tests/Bug_2804_Regression/client.cpp +++ b/TAO/tests/Bug_2804_Regression/client.cpp @@ -87,7 +87,6 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, ::perform_invocation<Test::NonRecursiveUnionWithStringStruct3> (hello, the_any); - } /** diff --git a/TAO/tests/Bug_2844_Regression/client.cpp b/TAO/tests/Bug_2844_Regression/client.cpp index f845a6894e5..29fe9fa32c2 100644 --- a/TAO/tests/Bug_2844_Regression/client.cpp +++ b/TAO/tests/Bug_2844_Regression/client.cpp @@ -86,7 +86,6 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */, the_any <<= foo5; ::perform_invocation<Test::NestedRecursiveStruct5> (hello, the_any); - } /** diff --git a/TAO/tests/Bug_2935_Regression/source.cpp b/TAO/tests/Bug_2935_Regression/source.cpp index 2c47c3ebe47..8b688662a21 100644 --- a/TAO/tests/Bug_2935_Regression/source.cpp +++ b/TAO/tests/Bug_2935_Regression/source.cpp @@ -47,7 +47,6 @@ bool parse_args (int & argc, ACE_TCHAR *argv[]) return false; } return true; - } diff --git a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp +++ b/TAO/tests/Bug_3598a_Regression/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/tests/Bug_3647_Regression/Backend_Impl.h b/TAO/tests/Bug_3647_Regression/Backend_Impl.h index 9593832e0de..65ee28a8bb8 100644 --- a/TAO/tests/Bug_3647_Regression/Backend_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Backend_Impl.h @@ -30,7 +30,6 @@ private: /// Use this flag to decide if the program should produce any output. bool verbose_; }; - } // namespace Bug_3647_Regression #endif // Bug_3647_Regression_Backend_h diff --git a/TAO/tests/Bug_3647_Regression/Middle_Impl.h b/TAO/tests/Bug_3647_Regression/Middle_Impl.h index 57fa2ec799a..4e9b2f7b45b 100644 --- a/TAO/tests/Bug_3647_Regression/Middle_Impl.h +++ b/TAO/tests/Bug_3647_Regression/Middle_Impl.h @@ -39,7 +39,6 @@ private: /// Control the freeze time based on the timeout time long timeout_; }; - } // namespace Bug_3647_Regression #endif // Bug_3647_Regression_Middle_hpp diff --git a/TAO/tests/Bug_3919_Regression/client.cpp b/TAO/tests/Bug_3919_Regression/client.cpp index c618a9c16f3..959d9b79f01 100644 --- a/TAO/tests/Bug_3919_Regression/client.cpp +++ b/TAO/tests/Bug_3919_Regression/client.cpp @@ -114,7 +114,6 @@ recursive_typecode_test (CORBA::ORB_ptr /* orb */, the_any <<= test; ::perform_invocation<Test::MyAttRefSequence> (hello, the_any); - } void @@ -159,7 +158,6 @@ nested_recursive_typecode_test (CORBA::ORB_ptr /* orb */, the_any <<= test; ::perform_invocation<Test2::MyAttRefSeqStruct> (hello, the_any); - } /** diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp index 37c5c9a9a99..820404f4721 100644 --- a/TAO/tests/COIOP/Client_Task.cpp +++ b/TAO/tests/COIOP/Client_Task.cpp @@ -68,5 +68,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index e58988ba545..68b972c975d 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -390,7 +390,6 @@ WUCS4_UTF16::read_wchar_array_i (ACE_InputCDR & cdr, return 1; } return 0; - } diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h index 90c1865a3df..db90c70cd8a 100644 --- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h @@ -84,7 +84,6 @@ private: private: CONV_FRAME::CodeSetId tcs_; - }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp index 94c6a6a242a..6fc065e8f78 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp @@ -56,5 +56,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp index 990e1564d52..ee66cf2ba35 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp @@ -55,5 +55,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp index 998b8a31cb0..8a3948e0e22 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp @@ -56,5 +56,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp index bbd3d5aa183..6bc6a75556b 100644 --- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp +++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp @@ -62,5 +62,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp index 990e1564d52..ee66cf2ba35 100644 --- a/TAO/tests/Collocated_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp @@ -55,5 +55,4 @@ Client_Task::svc (void) } return status; - } diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp index 52ce918d128..f7603965ef6 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp @@ -119,5 +119,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index ecb276fa6cb..4c61af68844 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -96,5 +96,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp index e99d68887d7..5ca5e2cfa3f 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Tests/Client_Task.cpp @@ -46,5 +46,4 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index ca5c1aa295a..4514bbe40e9 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -220,7 +220,6 @@ Client_Task::svc (void) } return 0; - } CORBA::ULong diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index 1459ceae8b7..f606a470b9b 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -292,7 +292,6 @@ Client_Task::svc (void) } return 0; - } CORBA::ULong 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 fa74efaad3d..5e56a562068 100644 --- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp +++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.cpp @@ -77,5 +77,4 @@ My_DII_Reply_Handler::handle_excep (TAO_InputCDR &incoming, ACE_DEBUG((LM_DEBUG, "calling My_DII_Reply_Handler::handle_excep()\n")); this->response_handler_->gateway_exception_reply (reply_status, incoming); - } diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index a16d400c48c..9cb8cf143be 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -55,7 +55,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, throw PortableServer::ForwardRequest ( CORBA::Object::_duplicate ( server.in ())); - } void diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 1477fa15f75..41d91c21896 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -48,7 +48,6 @@ void Object_A_i::finish (void) { this->finish_two_way_call_ = 1; - } void diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp index 00417759359..41808959dc7 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp @@ -179,7 +179,6 @@ Client_Task::svc (void) } return result; - } int diff --git a/TAO/tests/OBV/Simple/client.cpp b/TAO/tests/OBV/Simple/client.cpp index 8b8114307c8..78142594b76 100644 --- a/TAO/tests/OBV/Simple/client.cpp +++ b/TAO/tests/OBV/Simple/client.cpp @@ -16,5 +16,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return -1; else return 0; - } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index 9a2e94ade95..e4ba7baa0e3 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -126,7 +126,6 @@ test_impl::pass_vt_graph_out ( ACE_ASSERT (vt_graph_param->size () == 4); vt_graph_param->add_node ("NEW1"); ACE_ASSERT (vt_graph_param->size () == 5); - } void @@ -147,7 +146,6 @@ test_impl::pass_vt_graph_inout ( ACE_ASSERT (vt_graph_param->size () == 6); vt_graph_param->add_node ("NEW3"); ACE_ASSERT (vt_graph_param->size () == 7); - } void diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index b3b1d97c0e1..9d87012b6b1 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -326,7 +326,6 @@ Test_impl::array_op4 (const ::StringArray p1, } p3 = sa; - } diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 7c35bf1ef05..62d1e041b02 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -125,7 +125,6 @@ int simple_box_test () CORBA::remove_ref (p); return fail; - } // diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp index 31572c07431..927002b4744 100644 --- a/TAO/tests/OBV/ValueBox/server.cpp +++ b/TAO/tests/OBV/ValueBox/server.cpp @@ -100,5 +100,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } return 0; - } diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index 30718e8185e..7c406cdb756 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -131,7 +131,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, ACE_DEBUG ((LM_DEBUG, "Servant_Locator::postinvoke for %C.%C\n", name.in (), op )); - } int diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 4a6eebd0826..fefde92e666 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -139,7 +139,6 @@ test_object_deactivation (PortableServer::POA_ptr poa, // ACE_ASSERT dissappears in non-debug builds ACE_UNUSED_ARG (expected_exception_raised); - } int diff --git a/TAO/tests/POA/Loader/Servant_Activator.cpp b/TAO/tests/POA/Loader/Servant_Activator.cpp index e567d06fb06..4fea526b473 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.cpp +++ b/TAO/tests/POA/Loader/Servant_Activator.cpp @@ -94,5 +94,4 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid, (*servant_garbage_collector_) (oid, poa, servant); - } diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp index 5a99021e652..a5658c56d49 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp @@ -79,5 +79,4 @@ Client_Task::svc (void) } corb_->destroy (); return status; - } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 3494d7b5565..292c6e6a067 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -19,7 +19,6 @@ Secure_Vault_i::authenticate (const char * user) { if (ACE_OS::strcmp (user, "root") != 0) throw Test_Interceptors::Invalid (); - } CORBA::Long diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp index 45d43b27eca..04d12398ace 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2133/ClientORBInitializer.cpp @@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) client_interceptor = cri; info->add_client_request_interceptor (client_interceptor.in ()); - } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp index 8b78e2b5f97..b744352dca6 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_ORBInitializer.cpp @@ -59,7 +59,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp index ee3dd1054dc..85d6db42080 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_ORBInitializer.cpp @@ -48,7 +48,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index 33dbd1eff79..7c427559c30 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -42,7 +42,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index f50e351c6f2..cae006a7f86 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -32,7 +32,6 @@ Echo_Server_ORBInitializer::post_init ( server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index d852f17e999..36ee9800e63 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -49,7 +49,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 74b6a11a33f..c987a61ce31 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -105,7 +105,6 @@ ServerRequestInterceptor::receive_request ( ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " "to be correct.\n")); - } void diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index 545aac08305..3136185327b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -42,7 +42,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index c7e728d43c4..522004e802c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -43,7 +43,6 @@ Client_Task::svc (void) } return 0; - } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index ee3dd1054dc..85d6db42080 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -48,7 +48,6 @@ Client_ORBInitializer::post_init ( client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index f968f8333b0..16e648b1800 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -531,7 +531,6 @@ server::test_lanes_bands_client_propagated_poa (void) ::client_priority + 1, &server::test_bands_client_propagated_poa, "lanes_bands_client_propagated"); - } void diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp index 5c9f92d54b9..05180dba1a5 100644 --- a/TAO/tests/TransportCurrent/Framework/simple.cpp +++ b/TAO/tests/TransportCurrent/Framework/simple.cpp @@ -70,7 +70,6 @@ testCurrentLoader (int, char *[]) // ACE_ASSERT (factory != 0); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentLoader: OK\n"))); return 0; - } diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 6aa9a0ab9a8..4e26768f71d 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -122,7 +122,6 @@ namespace Test /// Endpoints hash table EndPoint endPoints_[1001]; }; - } // namespace Test #endif /* ISERVER_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index 7598c9c952a..86ed8867cb4 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -41,7 +41,6 @@ namespace Test private: PortableInterceptor::ClientRequestInterceptor_var interceptor_; }; - } #include /**/ "ace/post.h" diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h index d31cf147202..a3c37dcbd0d 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h @@ -112,7 +112,6 @@ namespace Test /// Test function TEST test_; }; - } // namespace Test #endif /* CLIENT_REQUEST_INTERCEPTOR_H */ diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h index d90aa84936f..216a63ac284 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h @@ -40,7 +40,6 @@ namespace Test private: PortableInterceptor::ServerRequestInterceptor_var interceptor_; }; - } #include /**/ "ace/post.h" diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp index 2a7f2791148..2c722b6b72b 100644 --- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp +++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp @@ -351,7 +351,6 @@ void CNamingTreeCtrl::OnDestroy() // TODO: Add your message handler code here ClearChildren(); - } diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp index ad8f422ae33..16ed157e9d1 100644 --- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp +++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp @@ -70,7 +70,6 @@ CNamingViewerDlg::CNamingViewerDlg(CORBA::ORB_ptr pORB, CWnd* pParent /*=0*/) m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); m_pORB = pORB; - } void CNamingViewerDlg::DoDataExchange(CDataExchange* pDX) diff --git a/TAO/utils/NamingViewer/SelectNSDialog.cpp b/TAO/utils/NamingViewer/SelectNSDialog.cpp index 98536f484bb..32d9378bc21 100644 --- a/TAO/utils/NamingViewer/SelectNSDialog.cpp +++ b/TAO/utils/NamingViewer/SelectNSDialog.cpp @@ -78,7 +78,6 @@ void CSelectNSDialog::OnAdd() ACE_TCHAR* pIOR = new ACE_TCHAR[Value.length() + 1]; ACE_OS::strcpy(pIOR, Value.c_str()); m_Servers.SetItemData(pos, (DWORD)pIOR); - } void CSelectNSDialog::OnRemove() diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp index abcb62328eb..3c75453f244 100644 --- a/TAO/utils/logWalker/Log.cpp +++ b/TAO/utils/logWalker/Log.cpp @@ -736,7 +736,6 @@ Log::parse_connection_handler_ctor_i (void) // char *c = ACE_OS::strchr (this->info_, '[') + 1; // size_t handle = ACE_OS::strtol (c, 0, 10); // ACE_DEBUG ((LM_DEBUG,"%d: constructed new handler for %d\n", offset_, handle)); - } void diff --git a/TAO/utils/logWalker/PeerObject.cpp b/TAO/utils/logWalker/PeerObject.cpp index 3d15be1db38..c78b5be710d 100644 --- a/TAO/utils/logWalker/PeerObject.cpp +++ b/TAO/utils/logWalker/PeerObject.cpp @@ -44,5 +44,4 @@ PeerObject::dump_detail (ostream &strm) << s << " invocation" << (s > 1 ? "s" : "") << endl; - } diff --git a/TAO/utils/logWalker/Thread.cpp b/TAO/utils/logWalker/Thread.cpp index d7e1bc9fa5a..9a5db19207e 100644 --- a/TAO/utils/logWalker/Thread.cpp +++ b/TAO/utils/logWalker/Thread.cpp @@ -141,7 +141,6 @@ Thread::split_filename (char *buff, size_t len) const *c = '_'; c = strchr (c, ']'); strcpy (c, ".txt"); - } void diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp index 164eb33ca11..18abab6c93c 100644 --- a/TAO/utils/nsgroup/nsgroup.cpp +++ b/TAO/utils/nsgroup/nsgroup.cpp @@ -209,7 +209,6 @@ NSGROUP::start_orb (void) } return RC_SUCCESS; - } int |