summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKnut Petter Svendsen <knut@altuma.no>2022-09-10 12:26:57 +0200
committerKnut Petter Svendsen <knut@altuma.no>2022-09-10 12:26:57 +0200
commit00b403be7df0442405bd5e3dcc07beaa6730ddd2 (patch)
treef0b5b1174001facb66b3bc45c40f222850a7dd57
parent60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0 (diff)
downloadATCD-00b403be7df0442405bd5e3dcc07beaa6730ddd2.tar.gz
Fixed Redundant blank line at the end of a code block should be deleted
-rw-r--r--ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp2
-rw-r--r--ACE/ASNMP/asnmp/address.cpp2
-rw-r--r--ACE/ASNMP/asnmp/asn1.cpp2
-rw-r--r--ACE/ASNMP/asnmp/wpdu.cpp1
-rw-r--r--ACE/Kokyu/Kokyu_dsrt.h1
-rw-r--r--ACE/ace/Cache_Map_Manager_T.cpp12
-rw-r--r--ACE/ace/Caching_Utility_T.cpp1
-rw-r--r--ACE/ace/Cleanup_Strategies_T.cpp1
-rw-r--r--ACE/ace/Configuration.cpp2
-rw-r--r--ACE/ace/Configuration_Import_Export.cpp1
-rw-r--r--ACE/ace/Dev_Poll_Reactor.h1
-rw-r--r--ACE/ace/FlReactor/FlReactor.cpp1
-rw-r--r--ACE/ace/FoxReactor/FoxReactor.cpp1
-rw-r--r--ACE/ace/Hash_Cache_Map_Manager_T.cpp6
-rw-r--r--ACE/ace/Message_Block.cpp1
-rw-r--r--ACE/ace/Object_Manager_Base.cpp1
-rw-r--r--ACE/ace/POSIX_Asynch_IO.h1
-rw-r--r--ACE/ace/POSIX_Proactor.cpp1
-rw-r--r--ACE/ace/QoS/QoS_Session_Impl.cpp1
-rw-r--r--ACE/ace/QtReactor/QtReactor.cpp1
-rw-r--r--ACE/ace/SOCK_Dgram_Mcast.cpp3
-rw-r--r--ACE/ace/SPIPE_Addr.h1
-rw-r--r--ACE/ace/SPIPE_Connector.cpp1
-rw-r--r--ACE/ace/SSL/SSL_SOCK_Stream.cpp1
-rw-r--r--ACE/ace/Service_Gestalt.cpp1
-rw-r--r--ACE/ace/Sock_Connect.cpp1
-rw-r--r--ACE/ace/Strategies_T.cpp2
-rw-r--r--ACE/ace/Stream.cpp1
-rw-r--r--ACE/ace/Svc_Conf_Param.h1
-rw-r--r--ACE/ace/Timer_Queue_T.cpp1
-rw-r--r--ACE/ace/TkReactor/TkReactor.cpp1
-rw-r--r--ACE/ace/XtReactor/XtReactor.cpp1
-rw-r--r--ACE/apps/JAWS3/jaws3/Signal_Task.cpp1
-rw-r--r--ACE/examples/APG/ThreadPools/Futures.cpp1
-rw-r--r--ACE/examples/ConfigViewer/ValueListCtrl.cpp1
-rw-r--r--ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp1
-rw-r--r--ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp1
-rw-r--r--ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp1
-rw-r--r--ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp1
-rw-r--r--ACE/examples/Naming/test_open.cpp1
-rw-r--r--ACE/examples/Naming/test_writers.cpp1
-rw-r--r--ACE/examples/Reactor/Misc/test_reactors.cpp1
-rw-r--r--ACE/examples/Reactor/Proactor/test_proactor2.cpp2
-rw-r--r--ACE/examples/Timer_Queue/Driver.cpp1
-rw-r--r--ACE/examples/Web_Crawler/URL_Visitor.cpp3
-rw-r--r--ACE/performance-tests/RPC/client.cpp1
-rw-r--r--ACE/performance-tests/SCTP/Options_Manager.cpp2
-rw-r--r--ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp3
-rw-r--r--ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp3
-rw-r--r--ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp3
-rw-r--r--ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Addr.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Environment.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Filter.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h1
-rw-r--r--ACE/protocols/ace/HTBP/HTBP_Stream.h1
-rw-r--r--ACE/protocols/ace/INet/BidirStreamBuffer.h1
-rw-r--r--ACE/protocols/ace/INet/ClientRequestHandler.h1
-rw-r--r--ACE/protocols/ace/INet/ConnectionCache.h2
-rw-r--r--ACE/protocols/ace/INet/FTP_ClientRequestHandler.h1
-rw-r--r--ACE/protocols/ace/INet/FTP_IOStream.h1
-rw-r--r--ACE/protocols/ace/INet/FTP_Request.h1
-rw-r--r--ACE/protocols/ace/INet/FTP_Response.h1
-rw-r--r--ACE/protocols/ace/INet/HTTPS_SessionFactory.h1
-rw-r--r--ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h1
-rw-r--r--ACE/protocols/ace/INet/HTTP_IOStream.h1
-rw-r--r--ACE/protocols/ace/INet/HTTP_StreamPolicy.h1
-rw-r--r--ACE/protocols/ace/INet/Request.h1
-rw-r--r--ACE/protocols/ace/INet/RequestHandler.h1
-rw-r--r--ACE/protocols/ace/INet/Response.h1
-rw-r--r--ACE/protocols/ace/INet/SSLSock_IOStream.h1
-rw-r--r--ACE/protocols/ace/INet/Sock_IOStream.h1
-rw-r--r--ACE/protocols/ace/INet/StreamInterceptor.h1
-rw-r--r--ACE/protocols/ace/INet/String_IOStream.h1
-rw-r--r--ACE/protocols/ace/INet/URLBase.h1
-rw-r--r--ACE/protocols/ace/RMCast/Acknowledge.cpp1
-rw-r--r--ACE/protocols/ace/RMCast/Link.cpp1
-rw-r--r--ACE/protocols/ace/RMCast/Protocol.h1
-rw-r--r--ACE/tests/Bug_3943_Regression_Test.cpp2
-rw-r--r--ACE/tests/CDR_Array_Test.cpp1
-rw-r--r--ACE/tests/Config_Test.cpp6
-rw-r--r--ACE/tests/Dynamic_Priority_Test.cpp1
-rw-r--r--ACE/tests/Max_Default_Port_Test.cpp1
-rw-r--r--ACE/tests/Max_Default_Port_Test_IPV6.cpp1
-rw-r--r--ACE/tests/Message_Queue_Notifications_Test.cpp1
-rw-r--r--ACE/tests/Multicast_Test_IPV6.cpp1
-rw-r--r--ACE/tests/Multihomed_INET_Addr_Test.cpp3
-rw-r--r--ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp1
-rw-r--r--ACE/tests/Network_Adapters_Test.cpp1
-rw-r--r--ACE/tests/OS_Test.cpp1
-rw-r--r--ACE/tests/QtReactor_Test.cpp1
-rw-r--r--ACE/tests/Reader_Writer_Test.cpp1
-rw-r--r--ACE/tests/TP_Reactor_Test.cpp1
-rw-r--r--ACE/tests/randomize.h1
-rw-r--r--ACE/websvcs/tests/Test_URL_Addr.cpp3
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp1
-rw-r--r--TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp1
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Bank/client.cpp1
-rw-r--r--TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_valuetype.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp1
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp1
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_typecode/alias_typecode.h1
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp1
-rw-r--r--TAO/TAO_IDL/fe/idl.yy.cpp1
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp1
-rw-r--r--TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp1
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp1
-rw-r--r--TAO/examples/Callback_Quoter/Consumer_Handler.cpp3
-rw-r--r--TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp1
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp1
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp1
-rw-r--r--TAO/examples/Load_Balancing_persistent/Identity_Client.cpp2
-rw-r--r--TAO/examples/Load_Balancing_persistent/Identity_Server.cpp1
-rw-r--r--TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp4
-rw-r--r--TAO/examples/OBV/Simple_util.cpp2
-rw-r--r--TAO/examples/OBV/Typed_Events/Client_i.cpp1
-rw-r--r--TAO/examples/Persistent_Grid/Grid_Client_i.cpp1
-rw-r--r--TAO/examples/Persistent_Grid/Simple_util.cpp2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/client.cpp1
-rw-r--r--TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp1
-rw-r--r--TAO/examples/Quoter/Generic_Factory_i.cpp1
-rw-r--r--TAO/examples/Quoter/client.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/Activity.cpp1
-rw-r--r--TAO/examples/RTCORBA/Activity/POA_Holder.cpp1
-rw-r--r--TAO/examples/RTScheduling/DT_Creator.cpp4
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp1
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/test.cpp1
-rw-r--r--TAO/examples/RTScheduling/POA_Holder.cpp6
-rw-r--r--TAO/examples/RTScheduling/Starter.cpp1
-rw-r--r--TAO/examples/Simple/Simple_util.cpp2
-rw-r--r--TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp8
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Event_Con.cpp1
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp1
-rw-r--r--TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp1
-rw-r--r--TAO/examples/TypeCode_Creation/main.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp1
-rw-r--r--TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp1
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp1
-rw-r--r--TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp1
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h1
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h1
-rw-r--r--TAO/orbsvcs/IFR_Service/be_produce.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp1
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp1
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp1
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.cpp1
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.cpp2
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp1
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp1
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp2
-rw-r--r--TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp1
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp1
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp2
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp1
-rw-r--r--TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp1
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp1
-rw-r--r--TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp1
-rw-r--r--TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp3
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp5
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp3
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp1
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.cpp3
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_tests.cpp2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp1
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp1
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp1
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp1
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp1
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp1
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Client.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.h2
-rw-r--r--TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp3
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/IOR_MCast/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp2
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp3
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp1
-rw-r--r--TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp3
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Events.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Driver.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp1
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp1
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp4
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/client.cpp1
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.cpp5
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp1
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp1
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp1
-rw-r--r--TAO/orbsvcs/tests/ior_corbaname/server.cpp1
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp1
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp1
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp1
-rw-r--r--TAO/performance-tests/Latency/AMI/client.cpp1
-rw-r--r--TAO/performance-tests/Latency/DII/client.cpp1
-rw-r--r--TAO/performance-tests/POA/Demux/demux_test_server.cpp3
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp1
-rw-r--r--TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp1
-rw-r--r--TAO/performance-tests/Sequence_Latency/AMI/client.cpp6
-rw-r--r--TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp1
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp6
-rw-r--r--TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp6
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode.h2
-rw-r--r--TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h2
-rw-r--r--TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode.h2
-rw-r--r--TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h2
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode.cpp1
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp1
-rw-r--r--TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h2
-rw-r--r--TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/String_TypeCode_Traits.h1
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h2
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Traits.h1
-rw-r--r--TAO/tao/AnyTypeCode/TypeCode_Value_Field.h2
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/Union_TypeCode_Static.h1
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode.h1
-rw-r--r--TAO/tao/AnyTypeCode/Value_TypeCode_Static.h1
-rw-r--r--TAO/tao/Asynch_Queued_Message.cpp1
-rw-r--r--TAO/tao/CDR.cpp2
-rw-r--r--TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp1
-rw-r--r--TAO/tao/CSD_ThreadPool/CSD_TP_Task.h1
-rw-r--r--TAO/tao/CodecFactory/CodecFactory_impl.cpp1
-rw-r--r--TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp1
-rw-r--r--TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp1
-rw-r--r--TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp1
-rw-r--r--TAO/tao/FoxResource/FoxResource_Loader.h1
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp2
-rw-r--r--TAO/tao/HTTP_Handler.cpp2
-rw-r--r--TAO/tao/IIOP_Profile.cpp1
-rw-r--r--TAO/tao/IORTable/Table_Adapter.cpp1
-rw-r--r--TAO/tao/Invocation_Adapter.cpp1
-rw-r--r--TAO/tao/Invocation_Retry_State.cpp1
-rw-r--r--TAO/tao/Messaging/Asynch_Invocation_Adapter.h1
-rw-r--r--TAO/tao/ORB_Core.cpp2
-rw-r--r--TAO/tao/PortableServer/Basic_SArguments.h1
-rw-r--r--TAO/tao/PortableServer/Creation_Time.h1
-rw-r--r--TAO/tao/PortableServer/Fixed_Size_SArgument_T.h3
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h1
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUnique.h1
-rw-r--r--TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h1
-rw-r--r--TAO/tao/PortableServer/LifespanStrategy.h1
-rw-r--r--TAO/tao/PortableServer/Object_Adapter.h1
-rw-r--r--TAO/tao/PortableServer/Root_POA.cpp1
-rw-r--r--TAO/tao/PortableServer/ServantRetentionStrategy.h1
-rw-r--r--TAO/tao/PortableServer/Servant_Upcall.cpp1
-rw-r--r--TAO/tao/Queued_Data.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp1
-rw-r--r--TAO/tao/RTCORBA/RT_Policy_i.cpp1
-rw-r--r--TAO/tao/RTScheduling/Current.cpp1
-rw-r--r--TAO/tao/RTScheduling/Request_Interceptor.cpp3
-rw-r--r--TAO/tao/Strategies/DIOP_Profile.cpp1
-rw-r--r--TAO/tao/Strategies/SCIOP_Acceptor.cpp1
-rw-r--r--TAO/tao/Strategies/SCIOP_Connection_Handler.cpp1
-rw-r--r--TAO/tao/Strategies/advanced_resource.cpp2
-rw-r--r--TAO/tao/Synch_Invocation.cpp1
-rw-r--r--TAO/tao/Synch_Invocation.h1
-rw-r--r--TAO/tao/Synch_Queued_Message.cpp1
-rw-r--r--TAO/tao/TAO_Internal.cpp1
-rw-r--r--TAO/tao/TAO_Server_Request.cpp1
-rw-r--r--TAO/tao/TkResource/TkResource_Loader.h1
-rw-r--r--TAO/tao/Transport.cpp2
-rw-r--r--TAO/tao/TransportCurrent/Current_Impl.h1
-rw-r--r--TAO/tao/TransportCurrent/Current_Loader.h1
-rw-r--r--TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h1
-rw-r--r--TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp1
-rw-r--r--TAO/tao/Utils/Implicit_Deactivator.h1
-rw-r--r--TAO/tao/Utils/ORB_Destroyer.h1
-rw-r--r--TAO/tao/Utils/PolicyList_Destroyer.h1
-rw-r--r--TAO/tao/Utils/RIR_Narrow.h1
-rw-r--r--TAO/tao/Wait_On_LF_No_Upcall.h1
-rw-r--r--TAO/tao/default_resource.cpp1
-rw-r--r--TAO/tests/AMI_Timeouts/client.cpp1
-rw-r--r--TAO/tests/AMI_Timeouts/timeout_client.cpp1
-rw-r--r--TAO/tests/Alt_Mapping/client.cpp1
-rw-r--r--TAO/tests/Alt_Mapping/driver.cpp1
-rw-r--r--TAO/tests/Alt_Mapping/ub_struct_seq.cpp1
-rw-r--r--TAO/tests/BiDirectional/client.cpp1
-rw-r--r--TAO/tests/BiDirectional_NestedUpcall/client.cpp1
-rw-r--r--TAO/tests/Big_Oneways/server.cpp2
-rw-r--r--TAO/tests/Big_Twoways/server.cpp1
-rw-r--r--TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp1
-rw-r--r--TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp1
-rw-r--r--TAO/tests/Bug_1693_Test/client.cpp1
-rw-r--r--TAO/tests/Bug_2188_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_2429_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_2560_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_2654_Regression/client.cpp2
-rw-r--r--TAO/tests/Bug_2669_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_2683_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_2935_Regression/source_i.cpp1
-rw-r--r--TAO/tests/Bug_3171_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3506_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_3506_Regression/server.cpp1
-rw-r--r--TAO/tests/Bug_3531_Regression/test_i.cpp1
-rw-r--r--TAO/tests/Bug_3672_Regression/client.cpp1
-rw-r--r--TAO/tests/Bug_3683_Regression/Simple_util.cpp2
-rw-r--r--TAO/tests/Bug_3953_Regression/server.cpp1
-rw-r--r--TAO/tests/CDR/allocator.cpp1
-rw-r--r--TAO/tests/CSD_Collocation/Collocation_Tester.cpp1
-rw-r--r--TAO/tests/Collocation/Collocation_Tester.cpp1
-rw-r--r--TAO/tests/Compression/RLECompressorTest.cpp2
-rw-r--r--TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp1
-rw-r--r--TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp2
-rw-r--r--TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp2
-rw-r--r--TAO/tests/DIOP/UDP_Client_i.cpp1
-rw-r--r--TAO/tests/DLL_ORB/Test_Client_Module.cpp1
-rw-r--r--TAO/tests/DynAny_Test/driver.cpp1
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp2
-rw-r--r--TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/Policy_Verifier.cpp2
-rw-r--r--TAO/tests/Exposed_Policies/RT_Properties.cpp1
-rw-r--r--TAO/tests/Faults/client.cpp1
-rw-r--r--TAO/tests/Faults/middle.cpp1
-rw-r--r--TAO/tests/ForwardOnceUponException/client.cpp1
-rw-r--r--TAO/tests/Hang_Shutdown/client.cpp1
-rw-r--r--TAO/tests/IORManipulation/IORTest.cpp1
-rw-r--r--TAO/tests/MT_BiDir/Client_Task.cpp1
-rw-r--r--TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp1
-rw-r--r--TAO/tests/Muxed_GIOP_Versions/server.cpp2
-rw-r--r--TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp1
-rw-r--r--TAO/tests/OBV/Forward/client.cpp1
-rw-r--r--TAO/tests/OBV/Indirection/MessengerClient.cpp1
-rw-r--r--TAO/tests/OBV/Simple/Simple_util.cpp2
-rw-r--r--TAO/tests/OBV/Supports/client.cpp2
-rw-r--r--TAO/tests/OBV/ValueBox/client.cpp2
-rw-r--r--TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp1
-rw-r--r--TAO/tests/ORB_shutdown/server.cpp1
-rw-r--r--TAO/tests/Objref_Sequence_Test/client.cpp1
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Client.cpp1
-rw-r--r--TAO/tests/Oneway_Send_Timeouts/Server.cpp1
-rw-r--r--TAO/tests/POA/Loader/Server_Manager.cpp1
-rw-r--r--TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp1
-rw-r--r--TAO/tests/POA/On_Demand_Activation/server.cpp2
-rw-r--r--TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_array_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_long_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_short_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_str_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_string.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_struct_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_wstr_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/bd_wstring.cpp1
-rw-r--r--TAO/tests/Param_Test/big_union.cpp1
-rw-r--r--TAO/tests/Param_Test/client.cpp1
-rw-r--r--TAO/tests/Param_Test/driver.cpp2
-rw-r--r--TAO/tests/Param_Test/fixed_array.cpp1
-rw-r--r--TAO/tests/Param_Test/fixed_struct.cpp1
-rw-r--r--TAO/tests/Param_Test/nested_struct.cpp1
-rw-r--r--TAO/tests/Param_Test/objref.cpp1
-rw-r--r--TAO/tests/Param_Test/objref_struct.cpp3
-rw-r--r--TAO/tests/Param_Test/recursive_struct.cpp1
-rw-r--r--TAO/tests/Param_Test/recursive_union.cpp1
-rw-r--r--TAO/tests/Param_Test/short.cpp1
-rw-r--r--TAO/tests/Param_Test/small_union.cpp1
-rw-r--r--TAO/tests/Param_Test/typecode.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_any_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_array_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_long_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_objref_seq.cpp4
-rw-r--r--TAO/tests/Param_Test/ub_short_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_str_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_string.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_struct_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_wstr_seq.cpp1
-rw-r--r--TAO/tests/Param_Test/ub_wstring.cpp1
-rw-r--r--TAO/tests/Param_Test/ulonglong.cpp1
-rw-r--r--TAO/tests/Param_Test/var_array.cpp1
-rw-r--r--TAO/tests/Param_Test/var_struct.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Benchmark/client.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp2
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp1
-rw-r--r--TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp1
-rw-r--r--TAO/tests/QtTests/client.cpp1
-rw-r--r--TAO/tests/QtTests/server.cpp1
-rw-r--r--TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp1
-rw-r--r--TAO/tests/RTCORBA/Client_Propagated/server.cpp1
-rw-r--r--TAO/tests/RTCORBA/RTMutex/server.cpp3
-rw-r--r--TAO/tests/RTCORBA/Server_Declared/client.cpp1
-rw-r--r--TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp1
-rw-r--r--TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp2
-rw-r--r--TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp1
-rw-r--r--TAO/tests/Server_Connection_Purging/client.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Benchmark/client.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp1
-rw-r--r--TAO/tests/Stack_Recursion/Client_Task.cpp1
-rw-r--r--TAO/tests/TransportCurrent/Framework/server.cpp1
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp7
-rw-r--r--TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h1
-rw-r--r--TAO/tests/TransportCurrent/IIOP/server.cpp1
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp1
-rw-r--r--TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp1
-rw-r--r--TAO/utils/catior/Catior_i.cpp1
-rw-r--r--TAO/utils/nsgroup/nsgroup.cpp1
-rw-r--r--TAO/utils/wxNamingViewer/wxBindDialog.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingTree.cpp42
-rw-r--r--TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp3
-rw-r--r--TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp5
-rw-r--r--TAO/utils/wxNamingViewer/wxViewIORDialog.cpp6
629 files changed, 0 insertions, 898 deletions
diff --git a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
index b5d173d2fb3..6a4e85d3b61 100644
--- a/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
+++ b/ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
@@ -129,7 +129,6 @@ ACEXML_Svcconf_Handler::endElement (const ACEXML_Char *,
this->stream_,
svc_dll,
this->stream_info_.active ());
-
}
else
{
@@ -308,7 +307,6 @@ ACEXML_Svcconf_Handler::startElement (const ACEXML_Char *,
else if (ACE_OS::strcmp (qName, ACE_TEXT ("initializer")) == 0)
{
this->get_initializer_attrs (alist);
-
}
else if (ACE_OS::strcmp (qName, ACE_TEXT ("static")) == 0)
{
diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp
index 94aaecbf95b..001337d36f3 100644
--- a/ACE/ASNMP/asnmp/address.cpp
+++ b/ACE/ASNMP/asnmp/address.cpp
@@ -518,7 +518,6 @@ int IpAddress::parse_address( const char *inaddr)
// save the friendly name
ACE_OS::strcpy( iv_friendly_name_, inaddr);
-
} // end if lookup result
else {
iv_friendly_name_status_ = rc;
@@ -2356,7 +2355,6 @@ int GenAddress::parse_address( const char *addr)
return 1; // ok, its a mac
}
break;
-
}
// otherwise its invalid
delete address;
diff --git a/ACE/ASNMP/asnmp/asn1.cpp b/ACE/ASNMP/asnmp/asn1.cpp
index 053e6dd63a4..e5c8ad90171 100644
--- a/ACE/ASNMP/asnmp/asn1.cpp
+++ b/ACE/ASNMP/asnmp/asn1.cpp
@@ -949,7 +949,6 @@ u_char * asn1::build_unsigned_int64( u_char *data,
high = (high << 8)
| ((low & mask) >> (8 * (sizeof(long) - 1)));
low <<= 8;
-
}
return data;
}
@@ -1122,7 +1121,6 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
sizeof( SmiCNTR64));
}
break;
-
} // end switch
}
diff --git a/ACE/ASNMP/asnmp/wpdu.cpp b/ACE/ASNMP/asnmp/wpdu.cpp
index dc42fe35529..1685d9190d2 100644
--- a/ACE/ASNMP/asnmp/wpdu.cpp
+++ b/ACE/ASNMP/asnmp/wpdu.cpp
@@ -507,7 +507,6 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
default:
tempvb.set_null();
-
} // end switch
// append the vb to the pdu
diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h
index baef1c871b3..bda65df470c 100644
--- a/ACE/Kokyu/Kokyu_dsrt.h
+++ b/ACE/Kokyu/Kokyu_dsrt.h
@@ -151,7 +151,6 @@ namespace Kokyu
const QoSDesc& qos2);
};
-
} //end of namespace
#if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp
index 17e5f489f0e..40933e8928e 100644
--- a/ACE/ace/Cache_Map_Manager_T.cpp
+++ b/ACE/ace/Cache_Map_Manager_T.cpp
@@ -77,7 +77,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
// Unless the notification goes thru the bind operation is
// not complete.
bind_result = -1;
-
}
}
@@ -112,7 +111,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
// Unless the notification goes thru the rebind operation is
// not complete.
rebind_result = -1;
-
}
}
@@ -152,12 +150,10 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
// Unless the notification goes thru the rebind operation is
// not complete.
rebind_result = -1;
-
}
else
{
old_value = old_cache_value.first ();
-
}
}
@@ -198,12 +194,10 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
// Unless the notification goes thru the rebind operation is
// not complete.
rebind_result = -1;
-
}
else
{
old_value = old_cache_value.first ();
-
}
}
@@ -234,7 +228,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
this->map_.unbind (key);
trybind_result = -1;
-
}
else
{
@@ -242,7 +235,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
// is overwritten with the value from the map.
if (trybind_result == 1)
value = cache_value.first ();
-
}
}
@@ -279,7 +271,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
find_result = -1;
else
value = cache_value.first;
-
}
}
@@ -314,7 +305,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
if (rebind_result == -1)
find_result = -1;
-
}
}
@@ -339,7 +329,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
if (result == -1)
unbind_result = -1;
-
}
return unbind_result;
@@ -364,7 +353,6 @@ ACE_Cache_Map_Manager<KEY, VALUE, CMAP_TYPE, ITERATOR_IMPL, REVERSE_ITERATOR_IMP
unbind_result = -1;
else
value = cache_value.first ();
-
}
return unbind_result;
diff --git a/ACE/ace/Caching_Utility_T.cpp b/ACE/ace/Caching_Utility_T.cpp
index aa344562d86..e9260b64872 100644
--- a/ACE/ace/Caching_Utility_T.cpp
+++ b/ACE/ace/Caching_Utility_T.cpp
@@ -79,7 +79,6 @@ ACE_Pair_Caching_Utility<KEY, VALUE, CONTAINER, ITERATOR, ATTRIBUTES>::clear_cac
key_to_remove,
value_to_remove) == -1)
return -1;
-
}
return 0;
diff --git a/ACE/ace/Cleanup_Strategies_T.cpp b/ACE/ace/Cleanup_Strategies_T.cpp
index 53cf0b876ac..ecf960124fa 100644
--- a/ACE/ace/Cleanup_Strategies_T.cpp
+++ b/ACE/ace/Cleanup_Strategies_T.cpp
@@ -72,7 +72,6 @@ ACE_Handler_Cleanup_Strategy<KEY, VALUE, CONTAINER>::cleanup (
if (container.unbind (*key) == -1)
return -1;
-
}
return 0;
diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp
index aec7e47706e..65a5424aecd 100644
--- a/ACE/ace/Configuration.cpp
+++ b/ACE/ace/Configuration.cpp
@@ -336,7 +336,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const
}// end else if values match.
++valueIndex;
-
}// end value while loop
// look in the rhs for values not in this
@@ -361,7 +360,6 @@ ACE_Configuration::operator== (const ACE_Configuration& rhs) const
}// end else if sections match.
++sectionIndex;
-
}// end section while loop
// Finally, make sure that there are no sections in rhs that do not
diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp
index 36946f8ccd2..d2b1d5767e3 100644
--- a/ACE/ace/Configuration_Import_Export.cpp
+++ b/ACE/ace/Configuration_Import_Export.cpp
@@ -673,7 +673,6 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section,
}
default:
return -3;
-
}// end switch on type
line += ACE_TEXT ("\n");
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 8d024131da1..05efadb696a 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -394,7 +394,6 @@ class ACE_Export ACE_Dev_Poll_Reactor : public ACE_Reactor_Impl
* an @c ACE_HANDLE value. This is Unix-specific.
*/
Event_Tuple *handlers_;
-
};
public:
diff --git a/ACE/ace/FlReactor/FlReactor.cpp b/ACE/ace/FlReactor/FlReactor.cpp
index edbac9be35e..ecb2f088a19 100644
--- a/ACE/ace/FlReactor/FlReactor.cpp
+++ b/ACE/ace/FlReactor/FlReactor.cpp
@@ -86,7 +86,6 @@ ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
handle_set.wr_mask_,
handle_set.ex_mask_,
&zero);
-
} while (nfound == -1 && this->handle_error () > 0);
if (nfound > 0)
diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp
index 9560a5ae2c2..339107ba842 100644
--- a/ACE/ace/FoxReactor/FoxReactor.cpp
+++ b/ACE/ace/FoxReactor/FoxReactor.cpp
@@ -65,7 +65,6 @@ ACE_FoxReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_
nfound = FoxWaitForMultipleEvents (width,
handle_set,
max_wait_time);
-
} while( nfound == -1 && this->handle_error () > 0 );
if (nfound > 0)
diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.cpp b/ACE/ace/Hash_Cache_Map_Manager_T.cpp
index 2c178581cdb..5eb4bcc825d 100644
--- a/ACE/ace/Hash_Cache_Map_Manager_T.cpp
+++ b/ACE/ace/Hash_Cache_Map_Manager_T.cpp
@@ -52,7 +52,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
// Unless the notification goes thru the bind operation is
// not complete.
bind_result = -1;
-
}
}
@@ -87,7 +86,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
// Unless the notification goes thru the rebind operation is
// not complete.
rebind_result = -1;
-
}
}
@@ -120,7 +118,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
this->map_.unbind (key);
trybind_result = -1;
-
}
else
{
@@ -128,7 +125,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
// is overwritten with the value from the map.
if (trybind_result == 1)
value = cache_value.first ();
-
}
}
@@ -155,7 +151,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
find_result = -1;
else
find_result = 0;
-
}
return find_result;
@@ -200,7 +195,6 @@ ACE_Hash_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY
if (result == -1)
unbind_result = -1;
-
}
return unbind_result;
diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp
index 3c6e51350ca..f675a9450f5 100644
--- a/ACE/ace/Message_Block.cpp
+++ b/ACE/ace/Message_Block.cpp
@@ -611,7 +611,6 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb,
// Set our rd & wr pointers
this->rd_ptr (start);
this->wr_ptr (start);
-
}
else
{
diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp
index 0cf1b6c9e89..a98f62fab27 100644
--- a/ACE/ace/Object_Manager_Base.cpp
+++ b/ACE/ace/Object_Manager_Base.cpp
@@ -199,7 +199,6 @@ ACE_OS_Object_Manager::instance ()
// ACE_ASSERT (instance_pointer == instance_);
instance_pointer->dynamically_allocated_ = true;
-
}
return instance_;
diff --git a/ACE/ace/POSIX_Asynch_IO.h b/ACE/ace/POSIX_Asynch_IO.h
index bb43facfda3..e06557c67ce 100644
--- a/ACE/ace/POSIX_Asynch_IO.h
+++ b/ACE/ace/POSIX_Asynch_IO.h
@@ -1136,7 +1136,6 @@ protected:
/// I/O handle used for writing.
ACE_HANDLE handle_;
-
};
/**
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index 3c1727f2336..11308f32efd 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -1216,7 +1216,6 @@ ACE_POSIX_AIOCB_Proactor::find_completed_aio (int &error_status,
error_status,
transfer_count)) // completed
break;
-
} // end for
if (count == 0) // all processed , nothing found
diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp
index 3af829ee295..dd247f68339 100644
--- a/ACE/ace/QoS/QoS_Session_Impl.cpp
+++ b/ACE/ace/QoS/QoS_Session_Impl.cpp
@@ -212,7 +212,6 @@ rsvp_callback (rapi_sid_t /* sid */,
ACELIB_DEBUG ((LM_DEBUG,
"Unknown RSVP Event Received\n"));
break;
-
}
// Set the updated ACE_QoS for the RSVP callback argument(QoS session).
diff --git a/ACE/ace/QtReactor/QtReactor.cpp b/ACE/ace/QtReactor/QtReactor.cpp
index ae856cd0cd6..4e1e38f0938 100644
--- a/ACE/ace/QtReactor/QtReactor.cpp
+++ b/ACE/ace/QtReactor/QtReactor.cpp
@@ -659,7 +659,6 @@ ACE_QtReactor::wait_for_multiple_events (
nfound = QtWaitForMultipleEvents (static_cast<int> (width),
handle_set,
max_wait_time);
-
} while( nfound == -1 && this->handle_error () > 0 );
if (nfound > 0)
diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp
index fc2dd83e225..9071ed56933 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Mcast.cpp
@@ -690,8 +690,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
}
return 1;
-
-
}
else
{
@@ -742,7 +740,6 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr,
}
return 1;
-
}
#else /* ACE_HAS_IPV6 */
// Unsubscribe on all local multicast-capable network interfaces, by
diff --git a/ACE/ace/SPIPE_Addr.h b/ACE/ace/SPIPE_Addr.h
index bcb2eb510e5..7ad05a91feb 100644
--- a/ACE/ace/SPIPE_Addr.h
+++ b/ACE/ace/SPIPE_Addr.h
@@ -106,7 +106,6 @@ private:
/// Pathname in the file system.
ACE_TCHAR rendezvous_[MAXPATHLEN + 1];
-
} SPIPE_addr_;
// Contents of an SPIPE address.
};
diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp
index 2bcf32ce187..2f8e4a96269 100644
--- a/ACE/ace/SPIPE_Connector.cpp
+++ b/ACE/ace/SPIPE_Connector.cpp
@@ -114,7 +114,6 @@ ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
}
// Get the amount of time remaining for ::WaitNamedPipe.
time_out_value = relative_time.msec ();
-
}
// Wait for the named pipe to become available.
diff --git a/ACE/ace/SSL/SSL_SOCK_Stream.cpp b/ACE/ace/SSL/SSL_SOCK_Stream.cpp
index 113adf25a61..961b889afb6 100644
--- a/ACE/ace/SSL/SSL_SOCK_Stream.cpp
+++ b/ACE/ace/SSL/SSL_SOCK_Stream.cpp
@@ -257,7 +257,6 @@ ACE_SSL_SOCK_Stream::send (size_t n, ...) const
// buffer in the varargs occurred.
if (result < data_len)
break;
-
}
}
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index 63ed91f71a9..fe41085324d 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -1079,7 +1079,6 @@ ACE_Service_Gestalt::open_i (const ACE_TCHAR program_name[],
ACE_OS::fclose(fp);
else
add_default = false;
-
}
}
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 498c1a9a7ea..6f19185c439 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1288,7 +1288,6 @@ ACE::get_ip_interfaces (size_t &count, ACE_INET_Addr *&addrs)
++count;
}
ACE_OS::freeaddrinfo (res0);
-
}
ACE_OS::fclose (fp);
}
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 4afcd174683..1ada5a8543d 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -865,7 +865,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
found);
if (result != 0)
return result;
-
}
// If it is a new connection, activate it.
@@ -932,7 +931,6 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
if (result != 0)
return result;
-
}
// If it is a new connection, activate it.
diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index 31bb58aff0c..0079d50883a 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -571,7 +571,6 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::unlink_i (void)
other_tail = other_tail->next ();
other_tail->writer ()->next (this->linked_us_->stream_tail_->writer ());
-
}
// Make sure the other side is also aware that it's been unlinked!
diff --git a/ACE/ace/Svc_Conf_Param.h b/ACE/ace/Svc_Conf_Param.h
index bebc3a18e4c..fff69f2dcb7 100644
--- a/ACE/ace/Svc_Conf_Param.h
+++ b/ACE/ace/Svc_Conf_Param.h
@@ -98,7 +98,6 @@ public:
/// String containing directive that will be scanned and parsed.
const ACE_TCHAR *directive;
-
} source;
/// Discriminant use to determine which union member to use.
diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp
index 94600bb5800..923cae1b7b8 100644
--- a/ACE/ace/Timer_Queue_T.cpp
+++ b/ACE/ace/Timer_Queue_T.cpp
@@ -286,7 +286,6 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::expire (const ACE_Time_
this->postinvoke (info, cur_time, upcall_act);
++number_of_timers_expired;
-
}
ACE_UNUSED_ARG (result);
diff --git a/ACE/ace/TkReactor/TkReactor.cpp b/ACE/ace/TkReactor/TkReactor.cpp
index 13c5904ccda..be79fff1826 100644
--- a/ACE/ace/TkReactor/TkReactor.cpp
+++ b/ACE/ace/TkReactor/TkReactor.cpp
@@ -65,7 +65,6 @@ ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
nfound = TkWaitForMultipleEvents (width,
handle_set,
max_wait_time);
-
} while (nfound == -1 && this->handle_error () > 0);
if (nfound > 0)
diff --git a/ACE/ace/XtReactor/XtReactor.cpp b/ACE/ace/XtReactor/XtReactor.cpp
index 945562c3dac..c1d690e0fe6 100644
--- a/ACE/ace/XtReactor/XtReactor.cpp
+++ b/ACE/ace/XtReactor/XtReactor.cpp
@@ -67,7 +67,6 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
nfound = XtWaitForMultipleEvents (width,
handle_set,
max_wait_time);
-
} while (nfound == -1 && this->handle_error () > 0);
if (nfound > 0)
diff --git a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
index a379721fb69..f5d20c75c74 100644
--- a/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
+++ b/ACE/apps/JAWS3/jaws3/Signal_Task.cpp
@@ -44,7 +44,6 @@ JAWS_Signal_Task_function (void *)
#endif // !defined (ACE_WIN32)
default:
break;
-
}
}
diff --git a/ACE/examples/APG/ThreadPools/Futures.cpp b/ACE/examples/APG/ThreadPools/Futures.cpp
index c207c734828..3ad8c8b8c39 100644
--- a/ACE/examples/APG/ThreadPools/Futures.cpp
+++ b/ACE/examples/APG/ThreadPools/Futures.cpp
@@ -274,7 +274,6 @@ Manager::shut_down (void)
delete req;
delete worker;
-
}
while (iter.advance ());
diff --git a/ACE/examples/ConfigViewer/ValueListCtrl.cpp b/ACE/examples/ConfigViewer/ValueListCtrl.cpp
index 53bbc04cdc5..9a30226ef3b 100644
--- a/ACE/examples/ConfigViewer/ValueListCtrl.cpp
+++ b/ACE/examples/ConfigViewer/ValueListCtrl.cpp
@@ -136,7 +136,6 @@ void ValueListCtrl::OnModify(wxCommandEvent& event)
Value = Dlg.GetUINTValue();
m_pConfig->set_integer_value(m_Key, Name, Value);
-
}
break;
case ACE_Configuration::BINARY:
diff --git a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp
index cd70de0e2ca..4623ff1ae84 100644
--- a/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp
+++ b/ACE/examples/IPC_SAP/ATM_SAP/CPP-client.cpp
@@ -131,7 +131,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
hosts[ i ],
i,
0 );
-
}
} /* if num_leaves == 1 */
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
index 16b15010cec..2dd15f63352 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -54,7 +54,6 @@ server (void *arg)
ACE_TEXT ("%p\n"),
ACE_TEXT ("recv")));
break;
-
}
else if (r_bytes == 0)
{
diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
index 0dc20d393cb..b35ba5910ee 100644
--- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
+++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
@@ -96,7 +96,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_ERROR ((LM_ERROR,
"%p\n",
"close"));
-
}
/* NOTREACHED */
return 0;
diff --git a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
index 879474447cf..7aa26e1ee48 100644
--- a/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
+++ b/ACE/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
@@ -70,7 +70,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_ERROR ((LM_ERROR,
"%p\n",
"close"));
-
}
/* NOTREACHED */
return 0;
diff --git a/ACE/examples/Naming/test_open.cpp b/ACE/examples/Naming/test_open.cpp
index abf9f393670..cdaf3323ca4 100644
--- a/ACE/examples/Naming/test_open.cpp
+++ b/ACE/examples/Naming/test_open.cpp
@@ -66,7 +66,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
if (i != 0)
return -1;
-
}
result = ns.close ();
diff --git a/ACE/examples/Naming/test_writers.cpp b/ACE/examples/Naming/test_writers.cpp
index 16a5b0997cc..83a4f4fc93a 100644
--- a/ACE/examples/Naming/test_writers.cpp
+++ b/ACE/examples/Naming/test_writers.cpp
@@ -65,7 +65,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
if (i != 0)
return -1;
-
}
}
return 0;
diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp
index 74dcf4a80dc..1afa4f40229 100644
--- a/ACE/examples/Reactor/Misc/test_reactors.cpp
+++ b/ACE/examples/Reactor/Misc/test_reactors.cpp
@@ -151,7 +151,6 @@ worker (void *args)
}
// ACE_DEBUG ((LM_DEBUG, "(%t) done with handle_events\n"));
-
}
ACE_NOTREACHED(return 0);
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index a2dc0ccfe18..e15a15c77b6 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -194,7 +194,6 @@ void Receiver::open (ACE_HANDLE handle,
ACE_ERROR ((LM_ERROR,
"%p\n",
"ACE_Asynch_Write_Stream::open"));
-
}
else if (this->rs_.open (*this, this->handle_) == -1)
{
@@ -699,7 +698,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
// Simplify , initial read with zero size
Rc = acceptor.open (ACE_INET_Addr (port),0,1);
-
}
else
{
diff --git a/ACE/examples/Timer_Queue/Driver.cpp b/ACE/examples/Timer_Queue/Driver.cpp
index afe3dd82b2a..3b7ff955884 100644
--- a/ACE/examples/Timer_Queue/Driver.cpp
+++ b/ACE/examples/Timer_Queue/Driver.cpp
@@ -132,7 +132,6 @@ Timer_Queue_Test_Driver<TQ, RECEIVER, ACTION>::parse_commands (const char *buf)
if (cancel_cmd_->execute ((void *) &id) == -1)
ACE_DEBUG ((LM_DEBUG, "Timer #%d is not valid\n", id));
-
}
break;
/* NOTREACHED */
diff --git a/ACE/examples/Web_Crawler/URL_Visitor.cpp b/ACE/examples/Web_Crawler/URL_Visitor.cpp
index ed5976e1a74..bf6ef871193 100644
--- a/ACE/examples/Web_Crawler/URL_Visitor.cpp
+++ b/ACE/examples/Web_Crawler/URL_Visitor.cpp
@@ -252,7 +252,6 @@ URL_Validation_Visitor::URL_Validation_Visitor (void)
"%p %s\n"
"strategy connector creation failed"));
-
}
URL_Validation_Visitor::~URL_Validation_Visitor (void)
@@ -408,7 +407,6 @@ URL_Validation_Visitor::visit (HTTP_URL &http_url)
"%p\n",
"body execute"),
-1);
-
}
return 0;
}
@@ -488,7 +486,6 @@ URL_Download_Visitor::make_visitation_strategy_factory (URL &url)
int retval = url.send_request ();
if (retval != -1)
break;
-
}
// @@ Here's where we could check to see if the <url> was HTTP or
// FTP, etc. But for now we'll just assume that everything is an
diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp
index c55671bf358..5481f774054 100644
--- a/ACE/performance-tests/RPC/client.cpp
+++ b/ACE/performance-tests/RPC/client.cpp
@@ -58,7 +58,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
throughput.sample (end - test_start,
end - start);
-
}
ACE_DEBUG ((LM_DEBUG, "Calibrating high resolution timer . . ."));
diff --git a/ACE/performance-tests/SCTP/Options_Manager.cpp b/ACE/performance-tests/SCTP/Options_Manager.cpp
index e8b774fb973..acd9373de2c 100644
--- a/ACE/performance-tests/SCTP/Options_Manager.cpp
+++ b/ACE/performance-tests/SCTP/Options_Manager.cpp
@@ -501,7 +501,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set)
ACE_OS::fprintf (out, " -h none help\n");
ACE_OS::fprintf (out, "\n");
-
} else if (!ACE_OS::strcmp(ACE_TEXT ("server-opts"), opts_set)){
ACE_OS::fprintf (out, " Flag Args Option-Name Default\n"
" -n none test-enable-nagle NO NAGLING\n");
@@ -525,7 +524,6 @@ void Options_Manager::_show_usage(FILE* out, ACE_TCHAR const * const opts_set)
ACE_OS::fprintf (out, " -h none help\n");
ACE_OS::fprintf (out, "\n");
-
} else {
ACE_OS::fprintf (out, "Invalid options set specified.\n");
}
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
index 62323a4ed9d..c677a757f0f 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_Association_Test.cpp
@@ -40,19 +40,16 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("Usage: SOCK_SEQPACK_Association_Test hostname:port\n")));
status = 1;
-
} else if (serverAddr.set(argv[1])) {
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_INET_Addr::set")));
status = 1;
-
} else if (connector.connect (dataStream, serverAddr)) {
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::connect")));
status = 1;
-
} else {
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Connected to server at %s\n"),
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
index 39d85149848..6cd98f45771 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
@@ -87,7 +87,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
ACE_TEXT ("%p\n"),
ACE_TEXT ("send_n")),
0);
-
} while (--numIterations);
// close and destroy the stream
@@ -326,7 +325,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
else if (result == 0){
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) select timed out\n")));
-
}
else { // case where a file descriptor was actually set
if (!(temp.is_set(acceptor_socket.get_handle()))){
@@ -345,7 +343,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
else{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) spawning server\n")));
-
}
// Run the server.
run_server (new_stream.get_handle ());
diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
index dfffbfa51b1..cfffabcb2d7 100644
--- a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp
@@ -85,7 +85,6 @@ static ACE_THR_FUNC_RETURN unmarshalledOctetServer (void *arg){
ACE_TEXT ("%p\n"),
ACE_TEXT ("send_n")),
0);
-
} while (--numIterations);
// close and destroy the stream
@@ -321,7 +320,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
else if (result == 0){
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) select timed out\n")));
-
}
else { // case where a file descriptor was actually set
if (!(temp.is_set(acceptor_socket.get_handle()))){
@@ -340,7 +338,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
else{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) spawning server\n")));
-
}
// Run the server.
run_server (new_stream.get_handle ());
diff --git a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
index 3189225a48b..b84300798a8 100644
--- a/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
+++ b/ACE/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
@@ -713,7 +713,6 @@ read_timer (char *str, int len)
{
perror ("Getting 'itimer' REAL failed");
return (0.0);
-
}
fprintf(stdout, "End transaction time = %d sec and %d usec\n", itimedol.it_value.tv_sec, itimedol.it_value.tv_usec);
prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
diff --git a/ACE/protocols/ace/HTBP/HTBP_Addr.h b/ACE/protocols/ace/HTBP/HTBP_Addr.h
index 0e03aea5e94..3484700dc53 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Addr.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Addr.h
@@ -79,7 +79,6 @@ namespace ACE
/// HTID - web-obtained unique-identifier
ACE_CString htid_;
};
-
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_Environment.h b/ACE/protocols/ace/HTBP/HTBP_Environment.h
index f70a29148a6..8e8d88691bf 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Environment.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Environment.h
@@ -95,7 +95,6 @@ namespace ACE
/// We created the config instance, so we must clean it up
bool own_config_;
-
};
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Filter.h
index add5595942f..2e2b458ded6 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Filter.h
@@ -87,7 +87,6 @@ namespace ACE
/// Store the most recent HTTP result code. Typically it will be 200,
/// but it could be a 4xx or 5xx code if the proxy reports an error.
int http_code_;
-
};
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h
index 8e76da9128c..03bb0c4cd2e 100644
--- a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h
+++ b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.h
@@ -51,7 +51,6 @@ namespace ACE
static ACE_TString htid_;
static ACE_SYNCH_MUTEX htid_lock_;
};
-
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 7d5e55836dd..08915e26f5a 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
@@ -73,7 +73,6 @@ namespace ACE
virtual ssize_t recv_data_trailer(Channel *);
private:
int make_request_header (Channel *, const char *, char *, size_t );
-
};
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index dcdd49f9919..95dfe9d8f38 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
@@ -70,7 +70,6 @@ namespace ACE
virtual ssize_t recv_data_header (Channel *);
virtual ssize_t recv_data_trailer(Channel *);
};
-
}
}
diff --git a/ACE/protocols/ace/HTBP/HTBP_Stream.h b/ACE/protocols/ace/HTBP/HTBP_Stream.h
index e6f5f3a7ca1..50630da7720 100644
--- a/ACE/protocols/ace/HTBP/HTBP_Stream.h
+++ b/ACE/protocols/ace/HTBP/HTBP_Stream.h
@@ -278,7 +278,6 @@ namespace ACE
/// associated with. On the inside, sessions are created by the Connector,
/// which then create streams on demand.
Session *session_;
-
};
}
}
diff --git a/ACE/protocols/ace/INet/BidirStreamBuffer.h b/ACE/protocols/ace/INet/BidirStreamBuffer.h
index 4267be12d21..61306083a9d 100644
--- a/ACE/protocols/ace/INet/BidirStreamBuffer.h
+++ b/ACE/protocols/ace/INet/BidirStreamBuffer.h
@@ -119,7 +119,6 @@ namespace ACE
BidirStreamBuffer(const BidirStreamBuffer&);
BidirStreamBuffer& operator = (const BidirStreamBuffer&);
};
-
}
}
diff --git a/ACE/protocols/ace/INet/ClientRequestHandler.h b/ACE/protocols/ace/INet/ClientRequestHandler.h
index 660eeeaddee..f448e06cb0e 100644
--- a/ACE/protocols/ace/INet/ClientRequestHandler.h
+++ b/ACE/protocols/ace/INet/ClientRequestHandler.h
@@ -96,7 +96,6 @@ namespace ACE
u_short port_;
};
};
-
}
}
diff --git a/ACE/protocols/ace/INet/ConnectionCache.h b/ACE/protocols/ace/INet/ConnectionCache.h
index d6a0df2b2e8..809503fd0d4 100644
--- a/ACE/protocols/ace/INet/ConnectionCache.h
+++ b/ACE/protocols/ace/INet/ConnectionCache.h
@@ -253,8 +253,6 @@ namespace ACE
ACE_SYNCH_CONDITION condition_;
map_type cache_map_;
};
-
-
}
}
diff --git a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h
index a11dc3bf840..64019d9c178 100644
--- a/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h
+++ b/ACE/protocols/ace/INet/FTP_ClientRequestHandler.h
@@ -218,7 +218,6 @@ namespace ACE
ACE_CString current_user_;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/FTP_IOStream.h b/ACE/protocols/ace/INet/FTP_IOStream.h
index e5d334bafdb..feb001bf3aa 100644
--- a/ACE/protocols/ace/INet/FTP_IOStream.h
+++ b/ACE/protocols/ace/INet/FTP_IOStream.h
@@ -110,7 +110,6 @@ namespace ACE
void set_interceptor (StreamBuffer::interceptor_type& interceptor);
};
-
}
}
diff --git a/ACE/protocols/ace/INet/FTP_Request.h b/ACE/protocols/ace/INet/FTP_Request.h
index bfbd2596cc4..69d44972ff6 100644
--- a/ACE/protocols/ace/INet/FTP_Request.h
+++ b/ACE/protocols/ace/INet/FTP_Request.h
@@ -100,7 +100,6 @@ namespace ACE
ACE_CString command_;
ACE_CString args_;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h
index 6e3def510a1..9b54236dd08 100644
--- a/ACE/protocols/ace/INet/FTP_Response.h
+++ b/ACE/protocols/ace/INet/FTP_Response.h
@@ -116,7 +116,6 @@ namespace ACE
int status_;
ACE_Array<ACE_CString> response_;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/HTTPS_SessionFactory.h b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h
index a38b99f6c68..7d64fef1747 100644
--- a/ACE/protocols/ace/INet/HTTPS_SessionFactory.h
+++ b/ACE/protocols/ace/INet/HTTPS_SessionFactory.h
@@ -59,7 +59,6 @@ namespace ACE
virtual ACE::INet::ConnectionHolder* create_connection (
const ACE::INet::ConnectionKey& key) const;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h
index 2124524ce5a..79747658edf 100644
--- a/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h
+++ b/ACE/protocols/ace/INet/HTTP_ClientRequestHandler.h
@@ -233,7 +233,6 @@ namespace ACE
Response response_;
SessionHolder* session_;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/HTTP_IOStream.h b/ACE/protocols/ace/INet/HTTP_IOStream.h
index d502fdad6f2..621c1f3a3ee 100644
--- a/ACE/protocols/ace/INet/HTTP_IOStream.h
+++ b/ACE/protocols/ace/INet/HTTP_IOStream.h
@@ -116,7 +116,6 @@ namespace ACE
void set_interceptor (StreamBuffer::interceptor_type& interceptor);
};
-
}
}
diff --git a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
index c465148b5b1..73e15241500 100644
--- a/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
+++ b/ACE/protocols/ace/INet/HTTP_StreamPolicy.h
@@ -80,7 +80,6 @@ namespace ACE
};
typedef ChunkedTransferStreamPolicyBase<StreamBuffer> ChunkedTransferStreamPolicy;
-
}
}
diff --git a/ACE/protocols/ace/INet/Request.h b/ACE/protocols/ace/INet/Request.h
index 32afdb23ad8..947cb71dea3 100644
--- a/ACE/protocols/ace/INet/Request.h
+++ b/ACE/protocols/ace/INet/Request.h
@@ -29,7 +29,6 @@ namespace ACE
Request ();
virtual ~Request ();
};
-
}
}
diff --git a/ACE/protocols/ace/INet/RequestHandler.h b/ACE/protocols/ace/INet/RequestHandler.h
index d24379dba66..37dbb4aa589 100644
--- a/ACE/protocols/ace/INet/RequestHandler.h
+++ b/ACE/protocols/ace/INet/RequestHandler.h
@@ -39,7 +39,6 @@ namespace ACE
virtual const Response& response () const = 0;
};
-
}
}
diff --git a/ACE/protocols/ace/INet/Response.h b/ACE/protocols/ace/INet/Response.h
index 8d07d155c3f..8ddecfc40b1 100644
--- a/ACE/protocols/ace/INet/Response.h
+++ b/ACE/protocols/ace/INet/Response.h
@@ -29,7 +29,6 @@ namespace ACE
Response ();
virtual ~Response ();
};
-
}
}
diff --git a/ACE/protocols/ace/INet/SSLSock_IOStream.h b/ACE/protocols/ace/INet/SSLSock_IOStream.h
index cec9f4f6ba9..f97887a9e1d 100644
--- a/ACE/protocols/ace/INet/SSLSock_IOStream.h
+++ b/ACE/protocols/ace/INet/SSLSock_IOStream.h
@@ -158,7 +158,6 @@ namespace ACE
typedef SSLSock_IStreamBase<ACE_NULL_SYNCH> SSLSock_IStream;
typedef SSLSock_OStreamBase<ACE_NULL_SYNCH> SSLSock_OStream;
typedef SSLSock_IOStreamBase<ACE_NULL_SYNCH> SSLSock_IOStream;
-
}
}
diff --git a/ACE/protocols/ace/INet/Sock_IOStream.h b/ACE/protocols/ace/INet/Sock_IOStream.h
index 970480246bd..ddd101c7453 100644
--- a/ACE/protocols/ace/INet/Sock_IOStream.h
+++ b/ACE/protocols/ace/INet/Sock_IOStream.h
@@ -157,7 +157,6 @@ namespace ACE
typedef Sock_IStreamBase<ACE_NULL_SYNCH> Sock_IStream;
typedef Sock_OStreamBase<ACE_NULL_SYNCH> Sock_OStream;
typedef Sock_IOStreamBase<ACE_NULL_SYNCH> Sock_IOStream;
-
}
}
diff --git a/ACE/protocols/ace/INet/StreamInterceptor.h b/ACE/protocols/ace/INet/StreamInterceptor.h
index 82368efefbd..9e080a744da 100644
--- a/ACE/protocols/ace/INet/StreamInterceptor.h
+++ b/ACE/protocols/ace/INet/StreamInterceptor.h
@@ -54,7 +54,6 @@ namespace ACE
};
typedef StreamInterceptorBase<char> StreamInterceptor;
-
}
}
diff --git a/ACE/protocols/ace/INet/String_IOStream.h b/ACE/protocols/ace/INet/String_IOStream.h
index 2cddd9cbf1e..508852317d9 100644
--- a/ACE/protocols/ace/INet/String_IOStream.h
+++ b/ACE/protocols/ace/INet/String_IOStream.h
@@ -155,7 +155,6 @@ namespace ACE
typedef String_IOSBase<char> CString_IOS;
typedef String_OStreamBase<char> CString_OStream;
typedef String_IStreamBase<char> CString_IStream;
-
}
}
diff --git a/ACE/protocols/ace/INet/URLBase.h b/ACE/protocols/ace/INet/URLBase.h
index c9a5ccdd85e..e6efb596a92 100644
--- a/ACE/protocols/ace/INet/URLBase.h
+++ b/ACE/protocols/ace/INet/URLBase.h
@@ -238,7 +238,6 @@ namespace ACE
static authenticator_map authenticators_;
};
-
}
}
diff --git a/ACE/protocols/ace/RMCast/Acknowledge.cpp b/ACE/protocols/ace/RMCast/Acknowledge.cpp
index a07977a6076..bd617f220fe 100644
--- a/ACE/protocols/ace/RMCast/Acknowledge.cpp
+++ b/ACE/protocols/ace/RMCast/Acknowledge.cpp
@@ -116,7 +116,6 @@ namespace ACE_RMCast
Message_ptr m (new Message);
m->add (nrtm);
msgs.push_back (m);
-
}
}
}
diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp
index b2bef9723a8..fb5bc709de3 100644
--- a/ACE/protocols/ace/RMCast/Link.cpp
+++ b/ACE/protocols/ace/RMCast/Link.cpp
@@ -51,7 +51,6 @@ namespace ACE_RMCast
ssock_.get_option (SOL_SOCKET, SO_RCVBUF, &r, &s);
//cerr << 5 << "send buffer size: " << r << endl;
-
}
// Bind address and port.
diff --git a/ACE/protocols/ace/RMCast/Protocol.h b/ACE/protocols/ace/RMCast/Protocol.h
index 2758c2656db..9bbd6ee49e7 100644
--- a/ACE/protocols/ace/RMCast/Protocol.h
+++ b/ACE/protocols/ace/RMCast/Protocol.h
@@ -1077,7 +1077,6 @@ namespace ACE_RMCast
os << sn;
os << addr;
os << port;
-
}
}
diff --git a/ACE/tests/Bug_3943_Regression_Test.cpp b/ACE/tests/Bug_3943_Regression_Test.cpp
index d4eca5c1b59..2763741b581 100644
--- a/ACE/tests/Bug_3943_Regression_Test.cpp
+++ b/ACE/tests/Bug_3943_Regression_Test.cpp
@@ -243,7 +243,6 @@ namespace {
ssize_t send (char send_char, const ACE_TCHAR * const send_desc);
const ACE_Time_Value DEFAULT_TIME_VALUE;
-
};
} // namespace ""
@@ -973,7 +972,6 @@ client (void *arg)
{
// Send the data to the server.
svc_handler->send_data ();
-
}
return 0;
}
diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp
index a639ef9a7be..9b68d8a0991 100644
--- a/ACE/tests/CDR_Array_Test.cpp
+++ b/ACE/tests/CDR_Array_Test.cpp
@@ -232,7 +232,6 @@ CDR_Test<T, H>::CDR_Test (int total, int niter, int use_array)
CDR_Test<T, H>::do_test(tdelta, niter, 1,
srcbuf, dstbuf,
sk, dk);
-
}
}
}
diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp
index 31eda47e3e1..e16932db307 100644
--- a/ACE/tests/Config_Test.cpp
+++ b/ACE/tests/Config_Test.cpp
@@ -780,7 +780,6 @@ Config_Test::testEquality ()
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("Cannot open heap1\n")),
-1);
-
}
else if ((heap2.open ()) != 0)
{
@@ -1077,7 +1076,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
else
// if the type is invalid, then go ahead and fail it.
rc = false;
-
}// end if the original type was not a string.
else
{
@@ -1097,11 +1095,9 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
// before we move on remove this value from the original.
original.remove_value (originalSection,
valueName.c_str ());
-
}// end else if values match.
valueIndex++;
-
}// end value while loop
// at this point the original should have no values. look
@@ -1116,7 +1112,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
// having a value indicates a mismatch
rc = valueIndex == 0;
-
}// end else if sections match.
if (rc)
@@ -1126,7 +1121,6 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
0); // do not remove subsections.
++sectionIndex;
-
}// end section while loop
// Finally, if the original has any sections, then we're not equal
diff --git a/ACE/tests/Dynamic_Priority_Test.cpp b/ACE/tests/Dynamic_Priority_Test.cpp
index b72c567b86b..de5939b43ed 100644
--- a/ACE/tests/Dynamic_Priority_Test.cpp
+++ b/ACE/tests/Dynamic_Priority_Test.cpp
@@ -681,7 +681,6 @@ run_performance_test (u_int min_load,
// Free the allocated pointer array.
delete [] supplier_args.array_;
-
}
// Free resources and leave.
diff --git a/ACE/tests/Max_Default_Port_Test.cpp b/ACE/tests/Max_Default_Port_Test.cpp
index 8a2b2e45bab..90641fcb154 100644
--- a/ACE/tests/Max_Default_Port_Test.cpp
+++ b/ACE/tests/Max_Default_Port_Test.cpp
@@ -283,7 +283,6 @@ run_main (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ")
ACE_TEXT ("or %d port may be busy; got to %d\n"),
ACE_MAX_DEFAULT_PORT, max_listened_port));
-
}
#endif // ACE_LACKS_ACCEPT
diff --git a/ACE/tests/Max_Default_Port_Test_IPV6.cpp b/ACE/tests/Max_Default_Port_Test_IPV6.cpp
index 3f1f0c74c41..fe0df33bcf7 100644
--- a/ACE/tests/Max_Default_Port_Test_IPV6.cpp
+++ b/ACE/tests/Max_Default_Port_Test_IPV6.cpp
@@ -239,7 +239,6 @@ run_main (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("Invalid ACE_MAX_DEFAULT_PORT ")
ACE_TEXT ("or %d port may be busy; got to %d\n"),
ACE_MAX_DEFAULT_PORT, max_listened_port));
-
}
#endif /* ACE_HAS_IPV6 */
diff --git a/ACE/tests/Message_Queue_Notifications_Test.cpp b/ACE/tests/Message_Queue_Notifications_Test.cpp
index db5ae164027..7ea1d2971eb 100644
--- a/ACE/tests/Message_Queue_Notifications_Test.cpp
+++ b/ACE/tests/Message_Queue_Notifications_Test.cpp
@@ -218,7 +218,6 @@ Watermark_Test::producer ()
i--;
if (this->msg_queue ()->is_full ())
break;
-
}
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) Producer: High water mark hit ----\n")));
diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp
index f8d8d9a8238..65347b3bf7d 100644
--- a/ACE/tests/Multicast_Test_IPV6.cpp
+++ b/ACE/tests/Multicast_Test_IPV6.cpp
@@ -928,7 +928,6 @@ int advance_addr (ACE_INET_Addr &addr)
ACE_TEXT ("multicast group address past %s\n"),
addr.get_host_addr ()),
-1);
-
}
}
#endif /* ACE_HAS_IPV6 */
diff --git a/ACE/tests/Multihomed_INET_Addr_Test.cpp b/ACE/tests/Multihomed_INET_Addr_Test.cpp
index c9a7d3d8762..922c2fc38d3 100644
--- a/ACE/tests/Multihomed_INET_Addr_Test.cpp
+++ b/ACE/tests/Multihomed_INET_Addr_Test.cpp
@@ -182,7 +182,6 @@ int run_main (int, ACE_TCHAR *[])
returned_num_secondaries,
num_secondaries));
status = 1;
-
}
@@ -260,7 +259,6 @@ int run_main (int, ACE_TCHAR *[])
ACE_TEXT ("(for primary address)\n")));
status = 1;
-
}
// Check that the secondary addresses in the in_out_sockaddr
@@ -358,7 +356,6 @@ int run_main (int, ACE_TCHAR *[])
returned_num_secondaries,
num_secondaries));
status = 1;
-
}
diff --git a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp
index 74c7f9d1b5d..ef9fc882510 100644
--- a/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp
+++ b/ACE/tests/Multihomed_INET_Addr_Test_IPV6.cpp
@@ -138,7 +138,6 @@ int run_main (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("(for primary address)\n")));
status = 1;
-
}
// Check that the secondary addresses in the in_out_sockaddr
diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp
index 8072d76ba62..7ef95d8116d 100644
--- a/ACE/tests/Network_Adapters_Test.cpp
+++ b/ACE/tests/Network_Adapters_Test.cpp
@@ -991,7 +991,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
default:
// return print_usage (argc,argv);
break;
-
}
}
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index abe20bdc17a..03666ca0ae2 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -861,7 +861,6 @@ string_strsncpy_test ()
9) == 0);
// size should be 9 (+ '\0' char)
THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(ACE_OS::strlen(strsncpy2) == 9);
-
}
#if defined (ACE_HAS_WCHAR)
diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp
index f21e9f880c3..dbb33561dee 100644
--- a/ACE/tests/QtReactor_Test.cpp
+++ b/ACE/tests/QtReactor_Test.cpp
@@ -611,7 +611,6 @@ int HandlersRegister::scheduleTimers (const ACE_Time_Value &p_TestTime)
-1);
DgramHandlers_[ i ] ->expectedTriggers (DgramsToSend);
-
}
return 0;
diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp
index a9c747f5f2f..95ff35d4457 100644
--- a/ACE/tests/Reader_Writer_Test.cpp
+++ b/ACE/tests/Reader_Writer_Test.cpp
@@ -157,7 +157,6 @@ reader (void *)
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%t) could not upgrade to write lock!\n")));
-
}
else // result == -1
{
diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp
index de78091aecd..d81410851ba 100644
--- a/ACE/tests/TP_Reactor_Test.cpp
+++ b/ACE/tests/TP_Reactor_Test.cpp
@@ -1173,7 +1173,6 @@ run_main (int argc, ACE_TCHAR *argv[])
if (addr.set (port, host, 1, addr.get_type ()) == -1)
ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), host));
rc += connector.start (addr, senders);
-
}
if (rc > 0)
diff --git a/ACE/tests/randomize.h b/ACE/tests/randomize.h
index 1b0526cc5e9..25d47a543b6 100644
--- a/ACE/tests/randomize.h
+++ b/ACE/tests/randomize.h
@@ -81,7 +81,6 @@ namespace
// Random number generator seed value.
unsigned int seed_;
-
};
/**
diff --git a/ACE/websvcs/tests/Test_URL_Addr.cpp b/ACE/websvcs/tests/Test_URL_Addr.cpp
index 581927fd6e5..eac973ec5d4 100644
--- a/ACE/websvcs/tests/Test_URL_Addr.cpp
+++ b/ACE/websvcs/tests/Test_URL_Addr.cpp
@@ -118,7 +118,6 @@ void test_ftp_addr (void)
"FTP[%d]\n"
" \"%s\" ERROR\n",
i, addresses[i]));
-
}
}
}
@@ -159,7 +158,6 @@ void test_mailto_addr (void)
"Mailto[%d]\n"
" \"%s\" ERROR\n",
i, addresses[i]));
-
}
}
}
@@ -204,7 +202,6 @@ void test_url_addr (void)
"URL[%d]\n"
" \"%s\" ERROR\n",
i, addresses[i]));
-
}
}
}
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
index 769f2b7c0b9..d86f8e03fc6 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerClient.cpp
@@ -28,7 +28,6 @@ int parse_args (int argc, ACE_TCHAR* argv[])
"-x - call shutdown on server\n",
argv[0]),
-1);
-
}
}
return 0;
diff --git a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
index bb4ae1a774c..7ee82018714 100644
--- a/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/Multithreading/GracefulShutdown/MessengerServer.cpp
@@ -134,7 +134,6 @@ int MessengerServer::parse_args (int argc, ACE_TCHAR* argv[])
"-r <n> - run ORB for <n> seconds\n",
argv[0]),
-1);
-
}
}
return 0;
diff --git a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
index cb78ad7347e..3a51587727f 100644
--- a/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Bank/client.cpp
@@ -98,7 +98,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
std::cout << "Client: Ending balance: " << b/100.0 << std::endl;
orb->destroy();
-
} catch(const CORBA::Exception& e) {
std::cerr << e << std::endl;
return 1;
diff --git a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
index a08e417f31b..06071e1be93 100644
--- a/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/ValueTypes/Messenger/MessengerClient.cpp
@@ -52,7 +52,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
std::cout << "Message sent successfully.\n";
msg->print();
std::cout << std::endl;
-
} else {
std::cout << "Message refused." << std::endl;
}
@@ -62,7 +61,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) {
}
orb->destroy();
-
} catch(const CORBA::Exception& e) {
std::cerr << e << std::endl;
return 1;
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index 6454a20f47a..869ed85a162 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -218,7 +218,6 @@ be_valuetype::determine_factory_style ()
ACE_TEXT ("determine_factory_style")
ACE_TEXT ("bad node in this scope\n")),
factory_style);
-
}
AST_Decl::NodeType node_type = d->node_type ();
@@ -279,7 +278,6 @@ be_valuetype::have_operation ()
ACE_TEXT ("has_operation")
ACE_TEXT ("bad node in this scope\n")),
0);
-
}
AST_Decl::NodeType nt = d->node_type();
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 1939360a4aa..27bbd0f0e13 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -488,7 +488,6 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
ACE_TEXT ("add_normal_reply - ")
ACE_TEXT ("bad node in this scope\n")),
-1);
-
}
//be_decl *arg = dynamic_cast<be_decl*> (d);
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index cc0145cd2e8..5b37f293a44 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -519,7 +519,6 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
),
0
);
-
}
AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d);
@@ -653,7 +652,6 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
ACE_TEXT ("create_reply_handler_operation - ")
ACE_TEXT ("bad node in this scope\n")),
-1);
-
}
AST_Argument *original_arg = dynamic_cast<AST_Argument*> (d);
@@ -847,7 +845,6 @@ be_visitor_ami_pre_proc::visit_scope (be_scope *node)
"(%N:%l) be_visitor_scope::visit_scope - "
"bad node in this scope\n"),
-1);
-
}
if (!d->ami_visit())
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index fd1e322a30c..014fd2f28ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -1798,7 +1798,6 @@ be_visitor_ccm_pre_proc::compute_inheritance (be_home *node)
UTL_NameList (full_name,
nullptr),
nullptr);
-
}
else
{
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
index 1e0c8462031..f69d3265add 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
@@ -110,7 +110,6 @@ be_visitor_context_ex_idl::visit_uses (be_uses *node)
{
os_ << IdentifierHelper::orig_sn (impl->name ()).c_str ()
<< " get_connection_" << lname << " ();";
-
}
return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
index 03394c4b548..02595291cc2 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
@@ -160,7 +160,6 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node)
<< "};";
this->gen_exec_entrypoint_decl ();
-
}
os_ << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
index d114738c868..61c9585d658 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
@@ -135,7 +135,6 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node)
<< "}";
this->gen_exec_entrypoint_defn ();
-
}
os_ << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
index c923902c738..c3084e8c4c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
@@ -335,7 +335,6 @@ be_visitor_facet_ami_exh::gen_facet_executor_class ()
ACE_TEXT ("::gen_facet_executor_class - ")
ACE_TEXT ("traverse_inheritance_graph() on ")
ACE_TEXT ("interface failed\n")));
-
}
}
else
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
index 8ff909c9856..c73e184388a 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
@@ -228,7 +228,6 @@ be_visitor_facet_ami_exs::init ()
else
this->sync_ = false;
-
}
int
be_visitor_facet_ami_exs::gen_reply_handler_class ()
@@ -383,7 +382,6 @@ be_visitor_facet_ami_exs::gen_facet_executor_class ()
ACE_TEXT ("::gen_facet_executor_class - ")
ACE_TEXT ("traverse_inheritance_graph() on ")
ACE_TEXT ("interface failed\n")));
-
}
ACE_CString scope_str (scope_name, nullptr, false);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 92808317280..4dd5df87a48 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -296,7 +296,6 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
ACE_TEXT ("create_response_handler_operation - ")
ACE_TEXT ("bad node in this scope\n")),
-1);
-
}
AST_Argument *original_arg =
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index 5ec81099376..0ea927be15e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -91,7 +91,6 @@ be_visitor_interface_ih::visit_interface (be_interface *node)
<< be_global->impl_class_suffix () << "& " << "operator=(const "
<< be_global->impl_class_prefix () << namebuf
<< be_global->impl_class_suffix () << "&);" << be_nl_2;
-
}
*os << "// Destructor" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
index 9135f9dfe30..bb59f46d946 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -52,8 +52,6 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
*os << "/// Setter for " << node->local_name() << " attribute" << be_nl
<< "/// @param[in] " << node->local_name() << " - New value for "
<< node->local_name() << " attribute" << be_nl;
-
-
}
else
{
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 80569862e4b..1bfee6eed03 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -332,7 +332,6 @@ be_visitor_operation_upcall_command_ss::gen_upcall (
}
os << be_uidt_nl;
-
}
--index;
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 869aadd95ce..5d8745b9630 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -510,7 +510,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
<< "if (result)" << be_idt_nl
<< "{" << be_idt_nl
<< "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
}
else if (pt == AST_PredefinedType::PT_pseudo)
{
@@ -519,7 +518,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
<< "if (result)" << be_idt_nl
<< "{" << be_idt_nl
<< "_tao_union." << f->local_name () << " (_tao_union_tmp.in ());";
-
}
else if (pt == AST_PredefinedType::PT_value)
{
@@ -528,7 +526,6 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
<< "if (result)" << be_idt_nl
<< "{" << be_idt_nl
<< "_tao_union." << f->local_name () << " (_tao_union_tmp);";
-
}
else if (pt == AST_PredefinedType::PT_char)
{
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index 8f86b379ac5..9d35c5dde70 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -620,7 +620,6 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
<< "{" << be_idt_nl
<< "return this->_pd_value;" << be_uidt_nl
<< "}" << be_nl_2;
-
}
return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
index c006b6c6384..272c249456c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
@@ -44,7 +44,6 @@ be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node)
"(%N:%l) be_visitor_scope::visit_scope - "
"bad node in this scope\n"),
-1);
-
}
be_field *field = dynamic_cast<be_field*> (d);
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 1a5d03955c1..4bacf9ed310 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -65,7 +65,6 @@ be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
"(%N:%l) be_visitor_scope::visit_scope - "
"codegen for scope failed\n"),
-1);
-
}
}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 6fae372e6ea..4862c602f8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -180,7 +180,6 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
<< "return formal_type_id == reinterpret_cast<ptrdiff_t> ("
<< node->name() << "::_downcast);" << be_uidt_nl
<< "}" << be_nl_2;
-
}
else if (is_an_amh_exception_holder)
{
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 26072d18399..ed8046910f7 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
@@ -46,7 +46,6 @@ namespace TAO
int common (be_type * node,
be_type * base,
const char * tctype);
-
};
}
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 00031ab9adf..03c82030f93 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -229,7 +229,6 @@ DRV_parse_args (long ac, char **av)
));
idl_global->parse_args_exit (1);
return;
-
}
}
else
diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp
index 7f54d146483..c2bfaf9678d 100644
--- a/TAO/TAO_IDL/fe/idl.yy.cpp
+++ b/TAO/TAO_IDL/fe/idl.yy.cpp
@@ -2766,7 +2766,6 @@ static int yy_get_next_buffer (void)
YY_FATAL_ERROR(
"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
}
if ( num_to_read > YY_READ_BUF_SIZE )
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
index 8c1b17ee70e..36f94f34dc1 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Broker.cpp
@@ -70,7 +70,6 @@ parse_args (int argc, ACE_TCHAR *argv[])
std::cerr << "Warning: Invalid priority detected, defaulting to very low.\n";
priority_level = Priority_Mapping::VERY_LOW;
break;
-
}
break;
diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
index d5e0b70a470..afb3d13f713 100644
--- a/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RTCORBA/Distributor_i.cpp
@@ -268,7 +268,6 @@ StockQuoter_i::get_stock_info (const char * stock_name)
stock_info->last = si.last_;
return stock_info._retn ();
-
}
catch (Stock_Database<StockDistributor_i>::Invalid_Stock &ex)
{
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
index e932771d85d..519863e3f55 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
@@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[])
{
ACE_DEBUG((LM_DEBUG,
"(%P|%t) ===> Caught FooException - as expected.\n"));
-
}
}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
index 24f3ef64fa2..59f8533b79a 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
@@ -72,7 +72,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[])
{
ACE_DEBUG((LM_DEBUG,
"(%P|%t) ===> Caught FooException - as expected.\n"));
-
}
}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
index e3a52473c9d..fd06475dcff 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
@@ -72,7 +72,6 @@ ClientTask::svc()
{
ACE_DEBUG((LM_DEBUG,
"(%P|%t) ===> Caught FooException - as expected.\n"));
-
}
// Two-Way calls with inout parameters.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
index c64376c9403..b2fb6013b67 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
@@ -87,7 +87,6 @@ ClientTask::svc()
{
ACE_DEBUG((LM_DEBUG,
"(%P|%t) ===> Caught FooException - as expected.\n"));
-
}
// Two-Way calls with inout parameters.
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
index ccfcbb7837d..4ddf2b2a130 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
@@ -73,7 +73,6 @@ ClientApp::run (int argc, ACE_TCHAR* argv[])
{
ACE_DEBUG((LM_DEBUG,
"(%P|%t) ===> Caught FooException - as expected.\n"));
-
}
}
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index e754759c4f9..96809c6d364 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -168,8 +168,6 @@ Consumer_Handler::via_naming_service ()
// the <_narrow> method.
this->server_ =
Notifier::_narrow (notifier_obj.in ());
-
-
}
catch (const CORBA::Exception& ex)
{
@@ -319,7 +317,6 @@ Consumer_Handler::run ()
// Run the ORB.
this->orb_->run ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 3819b279e74..d88b3ad1849 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -60,7 +60,6 @@ Notifier_Input_Handler::init_naming_service ()
naming_server_->rebind (notifier_obj_name,
notifier_obj.in());
-
}
catch (const CosNaming::NamingContext::AlreadyBound&)
{
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 33476782525..26d18d23418 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -49,7 +49,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
this->contents_->sendc_next_chunk (this->ami_handler_.in (),
this->offset_);
-
}
else
{
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 4ac44575a48..136e71cbc06 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
current =
RTScheduling::Current::_narrow (object.in ());
-
}
Worker worker1 (orb.in (),
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index c71fa10bf11..bbbe337f20f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
current =
RTScheduling::Current::_narrow (object.in ());
-
}
Worker worker1 (orb.in (), server.in (), current.in (), scheduler, 10, 15);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 625164d0927..dac14afb350 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -196,7 +196,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
current =
RTScheduling::Current::_narrow (object.in ());
-
}
TimeBase::TimeT deadline;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 282a235b963..ae098dcb145 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -155,7 +155,6 @@ Identity_Client::run (void)
// Record statistics.
throughput.sample (now - throughput_base,
now - latency_base);
-
}
ACE_OS::printf ("*=*=*=*=Aggregated result *=*=*=*=*=\n");
@@ -208,7 +207,6 @@ Identity_Client::run (void)
ACE_DEBUG ((LM_DEBUG,
"Invocation %s\n",
identity.in ()));
-
}
return 0;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 1ad9edc7dd8..5d5b72afde6 100644
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -214,7 +214,6 @@ Identity_Server::create_objects (size_t number_of_objects,
// Bind the servant in the random <Object_Group>.
group->bind (member);
-
}
}
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index b52f5cb5d6e..4c50b22b832 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -291,7 +291,6 @@ Object_Group_Factory_i::make_group (int random,
// dynamically allocated memory.
this->mem_pool_->free ((void *) ptr);
throw Load_Balancer::duplicate_group ();
-
}
// Return.
@@ -350,7 +349,6 @@ Object_Group_Factory_i::resolve (const char * id)
ACE_TEXT ("(%N|%l) The factory does not have any references ")
ACE_TEXT ("to the group that you have sought \n\n")),
0);
-
}
}
@@ -498,7 +496,6 @@ Object_Group_Factory_i::update_flags (int random)
if (!random)
*(this->flags_) = 3;
break;
-
}
}
@@ -624,7 +621,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member)
{
ACE_ERROR ((LM_ERROR,
"Unable to bind\n"));
-
}
}
}
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 25fc433539f..45b412010c2 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -258,8 +258,6 @@ Client<InterfaceObj, Var>::init (const char *name,
ACE_ERROR_RETURN ((LM_ERROR,
"no ior or naming options specified\n"),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index 008cfcda06e..f16ddf658fd 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -77,7 +77,6 @@ Checkpoint_Client_i::run (const char *name,
if (checkpoint.shutdown () == 1)
checkpoint->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index ddc3bae71cf..9c674fe0ea6 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -86,7 +86,6 @@ Grid_Client_i::run (const char *name,
grid->set (index_,
ctr,
(value_ + ctr));
-
}
}
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 618d5a493ce..3984299e49b 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -260,8 +260,6 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
ACE_ERROR_RETURN ((LM_ERROR,
"no ior or naming options specified\n"),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index ab2308011fd..6bd848410e2 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -133,7 +133,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// the one calling orb->shutdown () triggering the end of the ORB
// event loop.
delete client;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index d4caa0614df..cf4cc23bf95 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -198,7 +198,6 @@ Client::svc (void)
for (int c = 0; c < 10; ++c)
server_->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index 16c937b5805..66a60ebb862 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -134,7 +134,6 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
if (this->debug_level_ > 1)
ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Return an object reference to a new object.\n"));
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index d1a5c03878b..a65a944c5e1 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -124,7 +124,6 @@ Quoter_Client::run (void)
if (this->debug_level_ >= 1)
ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object: ACE Hardware = %i\n", q));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 70f2dbdd2f5..ba7dab08712 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -174,7 +174,6 @@ Activity::activate_job_list (void)
job_name.c_str ()));
active_job_count_++;
-
} /* while */
}
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 0c745663858..b999f5f3283 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -158,7 +158,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
// Create a thread-pool policy.
lanes_policy =
rt_orb->create_threadpool_policy (threadpool_id);
-
}
if (bands_.length () != 0)
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index 5174907299d..fb1818c3f98 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -204,7 +204,6 @@ DT_Creator::register_synch_obj (void)
this->naming_->resolve (name);
synch_context = CosNaming::NamingContext::_narrow (object.in ());
-
}
ACE_CString synch_name ("Synch");
@@ -323,8 +322,6 @@ DT_Creator::activate_job_list (void)
this->naming_->rebind (name.in (),
server.in ());
-
-
} /* while */
ACE_DEBUG ((LM_DEBUG,
@@ -574,7 +571,6 @@ DT_Creator::check_ifexit (void)
}
ACE_DEBUG ((LM_DEBUG,
"Log File Ready\n"));
-
}
}
}
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index 02f408591ba..b56821f79a3 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -142,7 +142,6 @@ MIF_Task::perform_task (void)
current_->update_scheduling_segment (name,
sched_param.in (),
sched_param.in ());
-
}
}
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 104718e2af0..7bba63a6bb9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -149,7 +149,6 @@ DT_Test::svc (void)
try
{
dt_creator_->create_distributable_threads (current_.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 5049898618e..7178f23d0cb 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -90,7 +90,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
arg_shifter.consume_arg ();
ACE_DEBUG ((LM_DEBUG,
"Thread Pool Initialized\n"));
-
}
else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Bands"))))
{
@@ -127,7 +126,6 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
} /* while -- Band values */
ACE_DEBUG ((LM_DEBUG,
"Bands Initialized\n"));
-
} /* if -Bands */
else // something else is showing up ...
{
@@ -179,7 +177,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
ACE_DEBUG ((LM_DEBUG,
"Activated Lanes\n"));
-
}
if (thread_pool_)
@@ -203,8 +200,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
ACE_DEBUG ((LM_DEBUG,
"Activated thread pool\n"));
-
-
}
if (bands_.length () != 0)
@@ -214,7 +209,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
rt_orb->create_priority_banded_connection_policy (this->bands_);
ACE_DEBUG ((LM_DEBUG,
"Activated Bands\n"));
-
}
CORBA::PolicyList poa_policy_list;
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 57eb4474de0..3a6bc37c1eb 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -126,7 +126,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
Starter starter (orb.in ());
starter.init ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index b4dd8c39ef2..9843d76d6c4 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -387,8 +387,6 @@ Client<ServerInterface>::init (const char *name,
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("no ior or naming options specified\n")),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index cc5324ee9f9..cbad17be5ad 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -186,7 +186,6 @@ DualEC_Supplier::init ()
this->naming_context_ =
CosNaming::NamingContext::_narrow (namingObj_var.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -349,10 +348,8 @@ DualEC_Supplier::run_nav_thread (void *arg)
if (nav_iter.done ())
nav_iter.first ();
-
}
while (++total_sent < sup->total_messages_);
-
}
catch (const CORBA::Exception&)
{
@@ -418,10 +415,8 @@ DualEC_Supplier::run_weap_thread (void *arg)
if (weap_iter.done ())
weap_iter.first ();
-
}
while (++total_sent < sup->total_messages_);
-
}
catch (const CORBA::Exception&)
{
@@ -547,8 +542,6 @@ DualEC_Supplier::create_schedulers (void)
this->rt_info_dummy_lo_.quantum,
this->rt_info_dummy_lo_.threads,
static_cast<RtecScheduler::Info_Type_t> (this->rt_info_dummy_lo_.info_type));
-
-
}
}
catch (const CORBA::Exception& ex)
@@ -600,7 +593,6 @@ DualEC_Supplier::create_event_channels (void)
naming_context_->bind (this->channel_lo_name_,
this->ec_lo_.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index cbfb0d7dc0a..76ca7f5475d 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -331,7 +331,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
delete demo_consumer;
root_poa->destroy (true, true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 718cb4cdf30..8acdacb1272 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -453,7 +453,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// when done, we clean up
delete event_Supplier_ptr;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index b461d88cc97..59cb0a0f392 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -502,7 +502,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// when done, we clean up
delete event_Supplier_ptr;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index 789df8ee0fb..bc39e1fb4b7 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -93,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_ERROR_RETURN ((LM_ERROR,
"ORB-created typecode not correct!\n"),
-1);
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index e06fb21e21f..ffcc01d103d 100644
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -93,7 +93,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy();
return 0;
-
}
catch(const CORBA::Exception& exc)
{
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
index ee8f68f6e63..7a425646582 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerClient.cpp
@@ -49,7 +49,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[])
messenger->send_message ("sysadmin@company.com",
"OCI's Distribution of TAO",
message.inout());
-
}
catch(const CORBA::Exception& ex) {
std::cerr << "Caught a CORBA exception: " << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
index ce7ed668126..b96c97316a5 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerConsumer.cpp
@@ -147,7 +147,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
orb->destroy ();
-
}
catch(const CORBA::Exception& ex) {
std::cerr << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
index 8938018d98d..0c917958e46 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/MessengerServer.cpp
@@ -82,7 +82,6 @@ ACE_TMAIN(int argc, ACE_TCHAR* argv[])
// Accept requests
orb->run();
orb->destroy();
-
}
catch(const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
index 9281d04ca16..b02d68f1b92 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Messenger_i.cpp
@@ -92,7 +92,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
}
consumer_proxy_->connect_structured_push_supplier(supplier.in());
-
}
catch(const CORBA::Exception& ex) {
std::cerr << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
index 56bb0b9cae4..a8762480edd 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerClient.cpp
@@ -42,7 +42,6 @@ int ACE_TMAIN(int argc, ACE_TCHAR * argv[])
messenger->send_message ("person@company.com",
"OCI's Distribution of TAO",
message.inout());
-
}
catch(const CORBA::Exception& ex) {
std::cerr << "Caught a CORBA exception: " << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
index 04368337c92..0aa9ba196b1 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerConsumer.cpp
@@ -130,7 +130,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
orb->destroy ();
-
}
catch(const CORBA::Exception& ex) {
std::cerr << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
index c478ac9848b..6573ddbd7a8 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/MessengerServer.cpp
@@ -75,7 +75,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv [])
// Accept requests
orb->run();
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
std::cerr << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
index 6ce7ae7e307..5a001740634 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/Messenger_i.cpp
@@ -103,7 +103,6 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb)
}
consumer_proxy_->connect_structured_push_supplier(supplier.in());
-
}
catch(const CORBA::Exception& ex) {
std::cerr << ex << std::endl;
diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
index 7376b2e1281..13c3a0fd154 100644
--- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/MessengerClient.cpp
@@ -59,7 +59,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
CORBA::String_var message = CORBA::string_dup( "Hello!" );
messenger->send_message( "TAO User", "TAO Test", message.inout() );
-
}
catch(const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
index 762ab74551e..bb3e8a4048c 100644
--- a/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/Security/ParticipatingApp/MessengerServer.cpp
@@ -83,7 +83,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
std::cout << "Messenger Server is shut down!"
<< std::endl;
std::cout << std::endl;
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception("Server Error: main block");
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
index ca97ea5c3bb..5a51f6c45e3 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/consumer.cpp
@@ -199,7 +199,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
orb->destroy();
return 0;
-
} catch(const CORBA::Exception& e) {
std::cerr << "Consumer: main() exception: " << e << std::endl;
} catch(const std::invalid_argument& e) {
diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
index 00414059517..303108b72d7 100644
--- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
+++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/supplier.cpp
@@ -244,7 +244,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
orb->destroy();
return 0;
-
} catch(CORBA::Exception& e) {
std::cerr << "Supplier: main() exception: " << e << std::endl;
} catch(std::invalid_argument& e) {
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index 654199c17e3..688399a5eb1 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -116,7 +116,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
index 11362ff2019..43bf42d75f5 100644
--- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
+++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.cpp
@@ -50,7 +50,6 @@ TAO_FT_Naming_Service::init (int argc, ACE_TCHAR* argv[])
if (result == -1)
return result;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 75c6833693b..36baa65335c 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -72,7 +72,6 @@ namespace TAO
FT_DefaultFaultAnalyzer (const FT_DefaultFaultAnalyzer & rhs);
/// Assignment operator.
FT_DefaultFaultAnalyzer & operator = (const FT_DefaultFaultAnalyzer & rhs);
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index f593e804845..882c0144437 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -140,7 +140,6 @@ namespace TAO
///TODO: Remove this later, it is just for testing.
// Keep track of how many notifications we have received.
size_t notifications_;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index f23699c8ba5..8d93dc33a79 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -64,7 +64,6 @@ namespace TAO
/// The object group's factories.
PortableGroup::FactoryInfos_var factories;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index 4743da70d72..d6ae2013e48 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -657,7 +657,6 @@ TAO::FT_ReplicationManager::add_member (
member);
result = group->reference ();
-
}
else
{
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index b2a1b75c6b6..520cfe46714 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -181,7 +181,6 @@ namespace TAO
// Data Members
private:
FT_ReplicationManager * replication_manager_;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index ecc69f45a19..fa82d98e021 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -226,7 +226,6 @@ namespace TAO
* boolean: set true when CORBA is done with this object.
*/
int gone_;
-
};
} // namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 2774ca20bfb..515b22f7c04 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -200,7 +200,6 @@ BE_produce (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (ACE_TEXT ("BE_produce"));
-
}
// Clean up.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
index a05fe2197c8..0c8a041bd6b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp
@@ -89,7 +89,6 @@ Activator_NT_Service::svc (void)
status = server.fini ();
report_status (SERVICE_STOPPED);
-
}
if (status != -1)
return 0;
diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
index 75a1cf2ce32..65e8aa1e9b4 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp
@@ -386,7 +386,6 @@ AsyncAccessManager::status_name (ImplementationRepository::AAM_Status s)
return "UPDATE_FAILED";
case ImplementationRepository::AAM_ACTIVE_TERMINATE:
return "ACTIVE_TERMINATE";
-
}
return "<undefined status>";
}
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index b38e41accbc..60621b1f137 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1629,8 +1629,6 @@ ImR_Locator_i::connect_server (UpdateableServerInfo& info)
this->opts_->ping_external (),
sip->server.in(),
sip->pid);
-
-
}
catch (const CORBA::Exception& )
{
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
index 0ba84a23c44..26e98badd8e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp
@@ -85,7 +85,6 @@ Locator_NT_Service::svc (void)
status = server.fini ();
report_status (SERVICE_STOPPED);
-
}
if (status != -1)
return 0;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f9daa66dd22..d0585c80483 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -136,7 +136,6 @@ Factory_Trader::_cxx_export (const char * name,
register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
CORBA::string_dup("GenericFactory"),
propertySeq);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index ece6aeb0e1c..64942450df1 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -49,7 +49,6 @@ TAO_Naming_Service::init (int argc, ACE_TCHAR* argv[])
if (result == -1)
return result;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index aeb6267622d..ef188c1982c 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -376,7 +376,6 @@ Clerk_i::register_clerk (void)
this->naming_client_->rebind (clerk_name,
this->time_service_clerk_.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -438,7 +437,6 @@ Clerk_i::init (int argc,
// first IOR.
if (this->get_first_IOR () != 0)
return -1;
-
}
// Create an instance of the Clerk.
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index c3763c78649..90133414c07 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -228,7 +228,6 @@ Server_i::init (int argc,
// Register the server object with the Naming Service.
this->register_server ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index 23e67a7741a..0681024f2f9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -63,7 +63,6 @@ associate_state (CORBA::ORB_ptr orb, CORBA::Any const& state)
pic->set_slot (state_slot_id (), state);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index f9a97e28060..a13dffdb184 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ()));
iors [cntr] =
orb->string_to_object (ior->c_str());
-
}
ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index eb12fd2ab21..147fb42f0e8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -69,7 +69,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
poa->destroy(1, 1);
orb->destroy();
-
} catch (const CORBA::Exception& e) {
e._tao_print_exception ("Combined Service:");
}
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 896a0253cf1..8cf2c96d7fe 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -109,7 +109,6 @@ DynServer_Loader::init (int argc, ACE_TCHAR* argv[])
runner_->activate();
ACE_DEBUG((LM_DEBUG, "dynserver: running.\n"));
-
} catch (Exception& e) {
e._tao_print_exception ("DynServer::init()");
}
@@ -132,7 +131,6 @@ DynServer_Loader::fini (void)
ACE_DEBUG((LM_DEBUG, "dynserver: shut down successfully.\n"));
return 0;
-
} catch (Exception& e) {
e._tao_print_exception ("DynServer::fini()");
}
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index e890ce2cc25..c270870f635 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -83,7 +83,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) {
root_poa->destroy(1, 1);
orb->destroy();
-
} catch (const CORBA::Exception& e) {
e._tao_print_exception ("TestServer::init()");
}
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index 80d40ebf367..13d885b60db 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -165,7 +165,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
// Destroy the POA
poa->destroy (1, 0);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index ff931d1f773..5d5dfad91bd 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -219,7 +219,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
ACE_DEBUG ((LM_DEBUG, "Size of data in Log = %d\n", retval));
this->notify_log_->destroy();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 9c831329b94..653890485d1 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -210,8 +210,6 @@ Supplier::run (int argc, ACE_TCHAR* argv[])
// Destroy the POA
poa->destroy (1, 0);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 9f8c6db6b8f..786c1029bc9 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -180,7 +180,6 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (ACE_TEXT ("Supplier error "));
-
}
return 0;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 765a594f9f6..12f60304909 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -186,7 +186,6 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (ACE_TEXT ("Supplier error "));
-
}
return 0;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 73cd247c642..a61cbed6fe5 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -184,7 +184,6 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (ACE_TEXT ("Supplier error "));
-
}
return 0;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index 8fe87a8af5e..6afd9723a61 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -183,7 +183,6 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception (ACE_TEXT ("Supplier error "));
-
}
return 0;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 07c950987ef..00090f0dbf6 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -49,7 +49,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
orb->run ();
root_poa->destroy (true, true);
-
}
catch (const CORBA::SytemException& )
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 777b90ae46e..9d85332a732 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -739,7 +739,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
ex._tao_print_exception (
"producer_check: not a producer");
-
}
}
}
@@ -834,8 +833,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
this->sep_b_.in (),
the_qos,
the_flows);
-
-
}
// This is the light profile, call connect()
else if (!CORBA::is_nil (this->vdev_a_.in ()) && !CORBA::is_nil (this->vdev_b_.in ()))
@@ -1999,7 +1996,6 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec)
TAO_AV_CORE::instance()->remove_connector(entry->flowname());
TAO_AV_CORE::instance()->remove_connector(control_flowname.c_str());
entry->protocol_object ()->destroy ();
-
}
}
}
@@ -2126,7 +2122,6 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
ORBSVCS_ERROR_RETURN ((LM_ERROR,
"Modifying QoS Failed\n"),
-1);
-
}
}
return 0;
@@ -3775,7 +3770,6 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
// flow_producer,
// this->fp_name_.inout ()
//);
-
}
if (CORBA::is_nil (this->mcastconfigif_.in ()))
ORBSVCS_ERROR_RETURN ((LM_ERROR, "TAO_FlowConnection::add_consumer: first add a producer and then a consumer\n"), 0);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 3040e0034e4..7167c33c74c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -149,7 +149,6 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
this->vdev_->define_property ("Related_MediaCtrl",
anyval);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index ee6a19ed0eb..b9bec6fe64c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -596,7 +596,6 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
ORBSVCS_DEBUG ((LM_DEBUG,
"Peer Address %s\n",
buf));
-
}
if (tokenizer [TAO_AV_FLOW_PROTOCOL] != 0)
@@ -736,7 +735,6 @@ TAO_Forward_FlowSpec_Entry::entry_to_string ()
//inet_addr->get_host_name (address, BUFSIZ);
//cstring += ACE_OS::itoa (address, BUFSIZ, inet_addr->get_port_number ());
-
}
break;
default:
@@ -982,7 +980,6 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string ()
char port_str[10];
ACE_OS::sprintf(port_str, "%u", control_port);
address_str += port_str;
-
}
this->entry_ = this->flowname_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 35090bd20e3..eaf6739f453 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -80,7 +80,6 @@ TAO_AV_UDP_QoS_Session_Helper::set_qos (ACE_Flow_Spec &ace_flow_spec,
if (TAO_debug_level > 0)
ORBSVCS_DEBUG ((LM_DEBUG,
"Filled up the Receiver QoS parameters\n"));
-
}
ACE_QoS_Manager qos_manager = handler->get_socket ()->qos_manager ();
@@ -1217,7 +1216,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
session_addr->set (local_addr->get_port_number (),
local_addr->get_host_name ());
-
}
else
{
@@ -1262,7 +1260,6 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
-1);
this->qos_session_->source_addr (src_addr);
-
}
handler->qos_session (this->qos_session_);
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index d2d5b191171..7fad90c6c92 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -177,7 +177,6 @@ TAO_AV_RTCP_Callback::receive_control_frame (ACE_Message_Block *data,
}
first_rtcp_packet = 0;
-
}
if (more != 0)
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
index 3cc42ab145d..f346476b939 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -142,7 +142,6 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(char* buffer, int *len)
index++;
ACE_OS::memcpy(this->reason_, &buffer[index], this->reason_length_);
index+=this->reason_length_;
-
}
else
this->reason_length_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index d057a1a3f14..9f6ab194b87 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -292,7 +292,6 @@ TAO_AV_Acceptor_Registry::open (TAO_Base_StreamEndPoint *endpoint,
this->acceptors_.insert (acceptor);
entry->protocol_object ()->control_object (entry->control_protocol_object ());
-
}
else
ORBSVCS_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index acedc060966..c7117ca75b4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -377,7 +377,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
this->typed_event_channel_->reconnected (this);
}
return;
-
}
this->typed_consumer_ = apply_policy (local_typed_consumer.in () );
@@ -389,7 +388,6 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
// Notify the event channel...
this->typed_event_channel_->connected (this);
-
} /* this->is_typed_ec */
else
{
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index b1dcefda33e..d6d4918ceca 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -55,7 +55,6 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
for (ITERATOR i = this->collection_.begin (); i != end; ++i)
{
worker->work (*i);
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
index 6d129cb04b4..fd3a321051d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.cpp
@@ -174,7 +174,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::event_channel_not_exist (
gateway->cleanup_consumer_ec ();
gateway->cleanup_consumer_proxies ();
-
}
catch (const CORBA::Exception& ex)
{
@@ -194,7 +193,6 @@ TAO_ECG_Reactive_ConsumerEC_Control::system_exception (
gateway->cleanup_consumer_ec ();
gateway->cleanup_consumer_proxies ();
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 288cc20e4a1..749f4fabdd4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -207,7 +207,6 @@ TAO_EC_Sched_Filter::init_rt_info ()
ORBSVCS_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
info->entry_point.in (),
this->name_.c_str ()));
-
}
#endif /* 0 */
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 51faf3010a7..44d849d394b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -33,7 +33,6 @@ namespace TAO
// Would be nice to have runtime option.
ACE_NEW (this->lock_,
ACE_Lock_Adapter<TAO_SYNCH_MUTEX>);
-
}
FT_ClientRequest_Interceptor::~FT_ClientRequest_Interceptor ()
@@ -269,7 +268,6 @@ namespace TAO
}
// Add this context to the service context list.
ri->add_request_service_context (sc, 0);
-
}
catch (const CORBA::Exception&)
{
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 c599f29c02b..b36fce844bf 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -411,7 +411,6 @@ void TAO_FTEC_Event_Channel_Impl::set_update (const FTRT::State & s)
}
(update_table[op->param._d()])(this, *op);
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index 865b4021f06..cda7e49566e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -233,7 +233,6 @@ IOGR_Maker::set_tag_components(
iorm_->set_property (&prop,
merged);
-
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 56e8a2fb68c..92fd6806139 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -456,7 +456,6 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core,
ACE_Auto_Array_Ptr<ACE_TCHAR> guard (htid);
this->addrs_[0] = ACE_TEXT_ALWAYS_CHAR (htid);
return 0;
-
}
// Check for multiple network interfaces.
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
index d1a51e63f52..d9bda41fe65 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
@@ -102,7 +102,6 @@ namespace TAO
/// Pointer to the ORB Core.
TAO_ORB_Core *orb_core_;
};
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 074abf69614..d194744b79a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -595,7 +595,6 @@ TAO_Repository_i::create_sections ()
this->config_->set_integer_value (key,
"pkind",
i);
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 91e605558eb..6efd82a4aa6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -417,7 +417,6 @@ TAO_LB_LeastLoaded::get_location (
// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n"));
// else
// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n"));
-
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 65b656bdee4..de0490e2bac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -305,7 +305,6 @@ TAO_LB_LoadAverage::analyze_loads (
*/
load_manager->enable_alert (loc);
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index 4534ce83ddb..da1c32d6dbb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -467,7 +467,6 @@ TAO_LB_LoadMinimum::get_location (
// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ PREVIOUS LOCATION\n"));
// else
// ORBSVCS_DEBUG ((LM_DEBUG, "^^^^^ CURRENT LOCATION\n"));
-
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
index 31b974fd655..4446ff28eb2 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -132,7 +132,6 @@ TAO_LB_ObjectReferenceFactory::make_object (
"TAO_LB_ObjectReferenceFactory::""make_object");
throw CORBA::BAD_INV_ORDER ();
-
}
catch (const PortableGroup::ObjectNotAdded& ex)
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index a20179e0a89..f6ae27f78d8 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -48,7 +48,6 @@ TAO_Rtec_LogConsumer::push (const RtecEventComm::EventSet& events)
this->log_->write_recordlist (recList);
-
}
void
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 05b715bb4ef..8d86516f2a9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -461,7 +461,6 @@ TAO_FT_Naming_Manager::add_member (
}
result = group->reference ();
-
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 2a6da089e86..91496594ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -321,7 +321,6 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O
this->naming_manager_.initialize (this->orb_.in (),
this->naming_manager_poa_.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
index 0787924201c..800b09cbb2f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
@@ -250,7 +250,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name,
CosNaming::Name_var name = this->name_service_->to_name ( str.in() );
this->name_service_->rebind (name.in(), group_var.in());
-
}
catch (const CosNaming::NamingContextExt::InvalidName& )
{
@@ -614,7 +613,6 @@ NS_group_svc::member_add (const ACE_TCHAR* group_name,
group_var = this->naming_manager_->add_member (group_var.in(),
location_name,
ior_var.in());
-
}
catch (const PortableGroup::ObjectGroupNotFound&)
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index c7fda38a709..c6634e80d49 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -607,7 +607,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
TAO_ROOT_NAMING_CONTEXT,
context_size);
this->assign (size_t(ROOT), false, new_context.in());
-
}
#if !defined (CORBA_E_MICRO)
@@ -786,7 +785,6 @@ TAO_Naming_Server::fini ()
{
if (!CORBA::is_nil (this->ns_poa_.in ()))
this->ns_poa_->destroy (1, 1);
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 91dea26ee15..d042436d088 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -221,7 +221,6 @@ TAO_Persistent_Context_Index::recreate_all ()
// If this is the root Naming Context, take a note of it.
if (context_impl->root ())
this->root_context_= result._retn ();
-
} while (index_iter->advance ());
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index f5e9f05863e..a73425037ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -331,7 +331,6 @@ TAO_CosNotify_Service::init_service (CORBA::ORB_ptr orb)
}
this->init_i2 (orb, TAO_Notify_PROPERTIES::instance()->dispatching_orb());
-
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
index 754cd9c72cd..9e02aa5add3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -84,7 +84,6 @@ namespace TAO_Notify
TAO_SYNCH_MUTEX internals_;
size_t active_;
Queue queue_;
-
};
} // namespace
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 6afb55621ab..dd89b16e07b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -93,7 +93,6 @@ namespace TAO_Notify
/// call the reconnect() method on all of our children to give them
/// the chance to do the same.
virtual void reconnect (void);
-
};
/// \brief Base class for Persistent Topology Objects.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index d9760588203..9b1b2dc7fb3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -216,7 +216,6 @@ namespace TAO
int linger_;
RegistryType registry_;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index 5a38b231d4b..2d5ed961376 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -133,7 +133,6 @@ TAO_PG_GenericFactory::create_object (
if (this->factory_map_.bind (fcid, factory_set) != 0)
throw PortableGroup::ObjectNotCreated ();
-
}
// Allocate a new FactoryCreationId for use as an "out" parameter.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 45bf7719256..f7eb0d328f4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -428,7 +428,6 @@ TAO::PG_Group_Factory::get_group_map ()
}
this->groups_read_ = true;
-
}
}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index cd39b131c6b..92c6ece137b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -222,7 +222,6 @@ namespace TAO
// Lazily read groups from store
bool groups_read_;
Storable_Factory * storable_factory_;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 5bc3b5acfce..90fb7f9e5dc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -363,7 +363,6 @@ namespace TAO
PortableGroup::InitialNumberMembersValue initial_number_members_;
PortableGroup::MinimumNumberMembersValue minimum_number_members_;
PortableGroup::FactoryInfos group_specific_factories_;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index c71ccf1fdad..8ac98a4ba32 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -111,7 +111,6 @@ namespace TAO
/// Next ogid to be allocated.
PortableGroup::ObjectGroupId next_ogid_;
-
};
} //namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
index bdd7d020f7a..21953ce8621 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.cpp
@@ -149,7 +149,6 @@ TAO::Object_Group_File_Guard::~Object_Group_File_Guard ()
// Notify if persistent store was updated.
if (object_group_.write_occurred_)
object_group_.state_written ();
-
}
catch (const TAO::Storable_Exception &se)
{
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
index d286befda9b..fcd44cac08a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Storable.h
@@ -179,7 +179,6 @@ namespace TAO
TAO_SYNCH_MUTEX lock_;
friend class Object_Group_File_Guard;
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
index 8c9ce8859b5..7879eab0f76 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -52,7 +52,6 @@ namespace TAO
/// Destructor.
~IIOP_SSL_Connection_Handler (void);
-
};
// ****************************************************************
@@ -98,7 +97,6 @@ namespace TAO
/// Flag that specifies whether or not setup of the SSLIOP::Current
/// object completed for the current thread and invocation.
bool setup_done_;
-
};
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 7d212d7f033..9aec1e2df1f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -626,7 +626,6 @@ TAO::SSLIOP::Acceptor::parse_options_i (int &argc, ACE_CString ** argv)
for (int j = i; j <= argc-1; j++)
argv[j] = argv[j+1];
argv[argc] = temp;
-
}
return 0;
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 00d8d4610b6..50a2d07f3fd 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -512,7 +512,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
ORBSVCS_ERROR ((LM_ERROR,
ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect,")
ACE_TEXT ("wait for completion failed\n")));
-
}
}
}
@@ -761,7 +760,6 @@ TAO::SSLIOP::Connector::ssliop_connect (
}
svc_handler_auto_ptr.release ();
-
}
else // not making new connection
{
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
index b3e99fdb0a1..188de270816 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
@@ -68,7 +68,6 @@ namespace TAO
};
typedef OpenSSL_st_var< ::EVP_PKEY > EVP_PKEY_var;
-
} // End SSLIOP namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
index 502ba128b68..cd5d30e77c1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h
@@ -115,7 +115,6 @@ namespace TAO
ACE_Time_Value timeout_;
bool check_host_;
-
};
} // End SSLIOP namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
index b9c571057f3..d0c5057b00a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -110,7 +110,6 @@ namespace TAO
private:
/// The OpenSSL structure whose reference count is managed.
T * st_;
-
};
} // End SSLIOP namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
index edd3480a24f..78f6dfd8ce8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
@@ -74,7 +74,6 @@ namespace TAO
};
typedef OpenSSL_st_var< ::SSL > SSL_var;
-
} // End SSLIOP namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
index 0b3250f7468..30f60e14961 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
@@ -72,7 +72,6 @@ namespace TAO
};
typedef OpenSSL_st_var< ::X509 > X509_var;
-
} // End SSLIOP namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 4a0521bc6f6..a7b0e2bf5f0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -484,14 +484,12 @@ void ACE_DynScheduler::export_to_file (RT_Info& info, FILE* file)
(void) ACE_OS::fprintf (file, "%s, %d\n",
(const char*)tmp.entry_point,
info.dependencies[i].number_of_calls);
-
}
(void) ACE_OS::fprintf (file, "# end calls\n%d\n%d\n\n",
info.priority,
info.preemption_subpriority);
-
}
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 484cd578e35..28898481921 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -210,7 +210,6 @@ Task_Entry::disjunctive_merge (Dependency_Type dt,
(const char*) this->rt_info ()->entry_point);
unresolved_remotes +=
ACE_CString (string_buffer);
-
}
// Check for and warn about unresolved local dependencies in
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 7b6fe47d043..8c5718ea40a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -228,14 +228,12 @@ void ACE_Scheduler::export_to_file (RT_Info& info, FILE* file)
(void) ACE_OS::fprintf (file, "%s, %d\n",
(const char*)tmp.entry_point,
info.dependencies[i].number_of_calls);
-
}
(void) ACE_OS::fprintf (file, "# end dependencies\n%d\n%d\n\n",
info.priority,
info.preemption_subpriority);
-
}
int
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index a6d18f5246e..c1d0f295880 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -595,7 +595,6 @@ void ACE_Scheduler_Factory::log_scheduling_entry(TAO_Reconfig_Scheduler_Entry *
log_tuple_subset(entry->prop_tuple_subset(), file);
ACE_OS::fprintf(file, "\n }\n}");
-
}
void ACE_Scheduler_Factory::log_tuple_subset(TUPLE_SET & tuple_subset,
@@ -668,8 +667,6 @@ ACE_Scheduler_Factory::log_scheduling_entries(TAO_Reconfig_Scheduler_Entry ** en
TAO_Reconfig_Scheduler_Entry * entry = entry_ptr_array[index];
log_scheduling_entry(entry, file);
-
-
}
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 18abc0ccae3..cc6d0633dc1 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -82,7 +82,6 @@ public:
RtecScheduler::Preemption_Priority_t preemption_priority;
CORBA::Long info_type;
RtecScheduler::RT_Info_Enabled_Type_t enabled;
-
};
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
index d7e3016e365..f0972555b06 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.h
@@ -84,7 +84,6 @@ namespace TAO
/// reference and used to protect messages.
::Security::EstablishTrust const trust_;
};
-
} // End Security namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
index e98a2a98609..08595155c0d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.h
@@ -82,7 +82,6 @@ namespace TAO
/// reference and used to protect messages.
::Security::QOP const qop_;
};
-
} // End Security namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
index 45cb40beb86..1eb5c216138 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
@@ -163,7 +163,6 @@ namespace TAO
::CORBA::Boolean access_allowed_i (OBJECT_KEY& key,
const char *operation_name,
CORBA::Boolean collocated = false);
-
};
/**
@@ -215,7 +214,6 @@ namespace TAO
// AccessDecision instance
SecurityLevel2::AccessDecision_var access_decision_;
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
index 0a547acf840..19523a409b2 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -96,9 +96,7 @@ namespace TAO
SecurityLevel3::FeatureDirective use_target_auth_;
SecurityLevel3::FeatureDirective use_confidentiality_;
SecurityLevel3::FeatureDirective use_integrity_;
-
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
index 554c5f83fd3..fa53a20768d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -49,9 +49,7 @@ namespace TAO
virtual SecurityLevel3::CredentialsAcquirer_ptr make (
TAO::SL3::CredentialsCurator_ptr curator,
const CORBA::Any & acquisition_arguments) = 0;
-
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
index e211d3389cd..8771e870726 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -83,7 +83,6 @@ namespace TAO
/// List of POA-specific OwnCredentials.
SecurityLevel3::OwnCredentialsList creds_list_;
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
index 1024d153449..f8930836857 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -61,7 +61,6 @@ namespace TAO
//@}
};
-
} // End SL3 namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
index e8423d4550a..0f88e7e2863 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h
@@ -122,7 +122,6 @@ namespace TAO
/// this object is registered.
TAO_ORB_Core * const orb_core_;
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index a8427985509..1290e329877 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -66,7 +66,6 @@ namespace TAO
/// Return the unique tag that identifies the concrete subclass.
virtual CORBA::ULong tag () const = 0;
};
-
} // End Security namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
index 613bde8efe9..8c301266429 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -88,7 +88,6 @@ namespace TAO
/// reference.
SecurityLevel3::CredentialsCurator_var credentials_curator_;
};
-
} // End SL3 namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index df3fe5bdc25..4c5c82673d9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -75,9 +75,7 @@ namespace TAO
/// Return the unique tag that identifies the concrete subclass.
virtual CORBA::ULong tag () const = 0;
-
};
-
} // End Security namespace.
} // End TAO namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index 45a40e92e4f..acea74c9755 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -51,7 +51,6 @@ namespace TAO
virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
const CORBA::Any & value);
};
-
} // End Security namespace
} // End TAO namespace
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 73007d9845b..449fec195b3 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -152,7 +152,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
TAO_TIO (uto_time,
this->time ()),
CORBA::NO_MEMORY ());
-
}
else
{
@@ -160,7 +159,6 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto)
TAO_TIO (this->time (),
uto_time),
CORBA::NO_MEMORY ());
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index b5757753635..40415cb1e31 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -73,7 +73,6 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
// Set the lowest time to the smallest time seen so far.
if (curr_server_time < lowest_time)
lowest_time = curr_server_time;
-
}
if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index d59f6a4d0d2..8bbbced6a32 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -1322,7 +1322,6 @@ static int yy_get_next_buffer ()
num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
number_to_move - 1;
-
}
if ( num_to_read > YY_READ_BUF_SIZE )
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index 7215d070a95..f3a9f0daf72 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -764,7 +764,6 @@ yyloop:
ctry = save->ctry;
if (save->state != yystate) YYABORT;
yyFreeState(save);
-
}
else
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index a8f06ab62e0..446b5354008 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -94,7 +94,6 @@ TAO_Trading_Loader::init (int argc, ACE_TCHAR *argv[])
// Initializes and sets up the Trading Service
CORBA::Object_var object =
this->create_object (orb.in (), command_line.get_argc(), command_line.get_TCHAR_argv());
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index a78f31a531c..de2cf0f85be 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -140,7 +140,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
-
}
ACE_hrtime_t test_end = ACE_OS::gethrtime ();
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index d9339f79429..b6de5b57c68 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -141,7 +141,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_hrtime_t now = ACE_OS::gethrtime ();
history.sample (now - start);
-
}
ACE_hrtime_t test_end = ACE_OS::gethrtime ();
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 44cc2c67df1..45bea32dbde 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -81,7 +81,6 @@ public:
ACE_hrtime_t elapsed = ACE_OS::gethrtime () - start;
this->sample_history.sample (elapsed);
-
} catch (const CORBA::Exception&) {
}
}
@@ -134,7 +133,6 @@ public:
CORBA::ULongLong dummy = 0;
(void) this->roundtrip_->test_method (dummy,
this->workload_);
-
} catch (const CORBA::Exception&) {
}
}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 76ac8596c38..2f1082f663d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -158,7 +158,6 @@ public:
try{
CORBA::ULongLong dummy = 0;
(void) session->sample (dummy);
-
} catch (const CORBA::Exception&) {
}
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 768ec577f22..8cf78960834 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
@@ -230,7 +229,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// Hack for now....
ACE_OS::sleep (1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 2f46f68479e..03e265cdfe4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -256,7 +256,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
}
catch (const CORBA::Exception& ex)
@@ -305,7 +304,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
"client::init failed\n"), -1);
SENDER::instance ()->pace_data ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 87785bb6e65..531173b6d4f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -123,7 +123,6 @@ Receiver_Callback::handle_destroy (void)
ex._tao_print_exception (
"Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 4ab1e54dc56..da72c56164b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -382,7 +382,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 459ccf9fa56..fbe163dff5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -23,7 +23,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
"In the signal handler\n"));
DISTRIBUTER::instance ()->done (1);
-
}
return 0;
}
@@ -119,12 +118,10 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
///Destroy old stream with the same flowname.
connection_manager.destroy (flowname);
-
}
/// Store the related streamctrl.
connection_manager.add_streamctrl (flowname.c_str (), this);
-
}
return true;
}
@@ -390,7 +387,6 @@ Distributer::shut_down (void)
sender_mmdevice.in ());
// DISTRIBUTER::instance ()->connection_manager ().destroy ();
-
}
catch (const CORBA::Exception& ex)
{
@@ -438,14 +434,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
if (wp)
{
orb->perform_work ();
-
}
}
DISTRIBUTER::instance ()->shut_down ();
// orb->shutdown(true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index b09446f5468..b6a113c5e18 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -68,7 +68,6 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
/// Store the related streamctrl.
connection_manager->add_streamctrl (flowname.c_str (),
this);
-
}
return 1;
}
@@ -262,8 +261,6 @@ Receiver::shut_down (void)
this->connection_manager_.unbind_receiver (this->sender_name_,
this->receiver_name_,
mmdevice_obj.in ());
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 4b9f16c1999..e2958400895 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -31,7 +31,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
"In the signal handler\n"));
g_shutdown = 1;
-
}
return 0;
}
@@ -157,7 +156,6 @@ Sender::shut_down (void)
SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
mmdevice.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -326,7 +324,6 @@ Sender::pace_data (void)
this->shut_down ();
break;
-
}
this->mb_.wr_ptr (n);
@@ -365,7 +362,6 @@ Sender::pace_data (void)
/// Run the orb for the wait time so the sender can
/// continue other orb requests.
TAO_AV_CORE::instance ()->orb ()->run (wait_time);
-
}
}
@@ -396,7 +392,6 @@ Sender::pace_data (void)
/// Reset the message block.
this->mb_.reset ();
-
} /// end while
}
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 5038555626a..0bd805403cb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -313,7 +313,6 @@ Client::run (void)
this->orb_->run (tv);
ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
}
catch (const CORBA::Exception& ex)
{
@@ -353,7 +352,6 @@ ACE_TMAIN (int argc,
if (result < 0)
ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
-
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 808d78b1227..74090d97812 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -136,8 +136,6 @@ Server::init (int argc,
// Register the video control object with the naming server.
this->my_naming_client_->rebind (server_sep_b_name,
sep_b_.in ());
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 793325b735d..183dca390a0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -148,7 +148,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// flow_spec.length (0);
// stream_control->stop (flow_spec);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index b538a2695fa..72d5d0e4b7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -172,7 +172,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, "done %d\n", gsf));
recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index e6e8cb44664..c636d9d9977 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -190,7 +190,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
send_latency.dump_results (ACE_TEXT("Send"), gsf);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index c14b1843eca..fa2b9a8bb5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -140,7 +140,6 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index b72278736b9..f5f5ac9169a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -329,7 +329,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
@@ -384,7 +383,6 @@ ACE_TMAIN (int argc,
// Start sending data.
result = SENDER::instance ()->pace_data ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 9af75d01c61..c07f8cc9356 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -125,7 +125,6 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
default:
ACE_DEBUG ((LM_DEBUG,"Unknown option\n"));
return -1;
-
}
}
return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 15f68fb1acb..6ee1789465a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -66,7 +66,6 @@ Receiver_Callback::flowname (const char* flow_name)
"%C File Opened Successfully\n",
this->flowname_.c_str ()));
-
}
int
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 4b74dfdff1c..887f61024ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -334,7 +334,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index e05923885f4..2062fc50c38 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -375,7 +375,6 @@ Client::pace_data (void)
// Reset the mb.
this->mb.reset ();
-
} // end while
// Since the file is read stop the stream.
@@ -384,7 +383,6 @@ Client::pace_data (void)
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index ec3f5548c13..7e567f8abf3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -305,7 +305,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index c5d8103778f..db2f5ae960b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 740430dec90..53cb840518c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -280,7 +280,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// If a stream was setup, destroy it.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index d1ee8185118..403c5ac0893 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -131,7 +131,6 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
@@ -279,8 +278,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_OS::sleep (1);
orb->destroy ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 48b4b51d641..f1ad51fba21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -396,7 +396,6 @@ Sender::pace_data (void)
// Reset the message block.
this->mb_.reset ();
-
} // end while
// File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 4ca00b3b1a0..222c21eaaf0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -71,7 +71,6 @@ Receiver_Callback::handle_destroy (void)
{
ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
return -1;
-
}
return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index c2eabbc1e9f..0936a4361c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -464,7 +464,6 @@ Sender::pace_data (void)
// Shut the orb down.
TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 7b1749f6094..f61cada2e74 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -107,7 +107,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa_manager->activate ();
orb->run ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index a6b5c27169a..e98c6b869be 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -85,7 +85,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index b602f5839d3..dcb138f4d1d 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -151,7 +151,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
CORBA::Policy_ptr policy = policies[i];
policy->destroy ();
-
}
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 281c701abdd..4fdbd6572c2 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
CORBA::Policy_ptr policy = policies[i];
policy->destroy ();
-
}
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 30a1ba98a50..1f02ddec574 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -422,7 +422,6 @@ CC_Client::init (int argc, ACE_TCHAR **argv)
ACE_DEBUG ((LM_DEBUG,
"Factory received OK\n"));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 01abae4bab0..02c06d83899 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -244,7 +244,6 @@ int CC_UnLock_Cmd::execute(void)
CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
ccls->unlock (mode_);
-
}
catch (const CORBA::Exception& ex)
{
@@ -347,7 +346,6 @@ int CC_ChangeMode_Cmd::execute(void)
CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
ccls->change_mode (held_mode_, new_mode_);
-
}
catch (const CORBA::Exception& ex)
{
@@ -540,7 +538,6 @@ CC_Lookup_Cmd::execute(void)
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
cc_lockset_ = ccls;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index ff947dd64eb..5073a4f2aab 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -209,7 +209,6 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
ccls->lock (CosConcurrencyControl::read);
-
}
catch (const CORBA::Exception& ex)
{
@@ -312,7 +311,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
ACE_DEBUG ((LM_DEBUG,
"attemptet to release %s lock\n",
get_lock_mode_name (mode_)));
-
}
catch (const CosConcurrencyControl::LockNotHeld& userex)
{
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 91776012695..7be8a6b6ed0 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index d8d9bc52d97..9ad047ca96e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index f98e7edcaee..37fa4b842c3 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -171,7 +171,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[])
ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
ec_impl.shutdown ();
-
}
catch (const CORBA::SystemException& sys_ex)
{
@@ -1012,7 +1011,6 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
qos.get_SupplierQOS ();
this->receiver_->connect (qos_copy);
-
}
void
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 731a92e2cca..4ae2fb8e539 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -352,7 +352,6 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
scheduler = scheduler_impl->_this ();
}
break;
-
}
// We use this buffer to generate the names of the local
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 5e21504ad0a..36399a21d1e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -39,7 +39,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index ffc8063c080..727ab33817c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -40,7 +40,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index f39d36996f4..dc00e890387 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -273,7 +273,6 @@ EC_Observer::execute_test (void)
rmt_ec->append_observer (obs.in ());
this->gwys_[i].observer_handle (h);
-
}
if (this->allocate_tasks () == -1)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index b57aa1d2c18..8b530e70ecc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -99,7 +99,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy();
return 0;
-
}
catch (const CORBA::Exception& exc)
{
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index f18548a703e..a2e74436ef0 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -233,7 +233,6 @@ EC_Supplier_Task::svc (void)
// ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
this->supplier_->send_event (event);
-
}
catch (const CORBA::SystemException& sys_ex)
{
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 2f86d0c753e..bfee692bb08 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -295,7 +295,6 @@ int FTClientMain::pass (
}
echo = 0;
break;
-
}
case '>':
{
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 450ef8bd016..60150e30990 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -225,7 +225,6 @@ int FTAPP::FT_Creator::run (void)
}
iogr_seq_ += 1;
-
}
typeCount = this->unregister_roles_.size();
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 131f9e30512..91241cb64c4 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -103,8 +103,6 @@ namespace FTAPP
* prefix for names
*/
ACE_CString prefix_;
-
-
};
} // namespace TAO
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index be9bed2e5fd..105cfa6298c 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -296,7 +296,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
//@@ this is a bit of a hack
creation_id >>= group_id;
-
}
const PortableGroup::Location * first_location = 0;
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index 50ae2d24637..e1d7fa6888f 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t) - Removed Member at Location <%s>\n"),
this->location_.in ()));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 4276d42ff26..06e69c84b12 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -135,7 +135,6 @@ LB_server::start_orb_and_poa (void)
ACE_TEXT (" (%P|%t) Unable to get Naming Manager ")
ACE_TEXT ("Reference.\n")),
-1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 41fa104ce9d..dffc347a8ba 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -1522,7 +1522,6 @@ do_persistence_objectgroup_test (
out << num_locations << std::endl;
out << loc[0].id.in () << std::endl;
out << member_str.in() << std::endl;
-
}
catch (const PortableGroup::ObjectGroupNotFound&)
{
@@ -1740,7 +1739,6 @@ do_equivalence_name_test (
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("INFO: ns2ref profile count: %d\n"),
ns2_count));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
index 5e509d5c117..640888ebb9e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
@@ -124,7 +124,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 4fad32a961d..1270f07d131 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n",
this->location_.in ()));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
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 b51bfac2a0d..a05c3ae676d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -133,7 +133,6 @@ LB_server::start_orb_and_poa (void)
ACE_TEXT (" (%P|%t) Unable to get Naming ")
ACE_TEXT ("Manager Reference\n")),
-1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 717df80dbae..42bb126e69d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -80,7 +80,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// Narrow it to a Basic object
basic =
Test::Basic::_narrow (tmp.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -104,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_TEXT ("(%P|%t) - Client request handled ")
ACE_TEXT ("by object at <%C>\n"),
the_string.in ()));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
index 36cb74661c1..2e3d9e03177 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
@@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 4d2423caf54..036456550b7 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -177,7 +177,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ns2ref),
-1);
root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -665,8 +664,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Unbound %i objects in %.2f secs\n"),
test_runs, secs));
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
index 4fad32a961d..1270f07d131 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n",
this->location_.in ()));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
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 17231082463..ca0b3a3b68e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -131,7 +131,6 @@ LB_server::start_orb_and_poa (void)
ACE_TEXT (" (%P|%t) Unable to get Naming ")
ACE_TEXT ("Manager Reference\n")),
-1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
index 56e05df6664..b589a527aaf 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
@@ -150,7 +150,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// Narrow it to a Basic object
basic =
Test::Basic::_narrow (tmp.in ());
-
}
catch (CORBA::Exception& ex)
{
@@ -174,7 +173,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_TEXT ("(%P|%t) - Client request handled ")
ACE_TEXT ("by object at <%C>\n"),
the_string.in ()));
-
}
catch (CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
index 36cb74661c1..2e3d9e03177 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
@@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 0e6b845a470..b57c464b174 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -81,8 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_INFO,
"CLIENT: Number %d .\n",
number));
-
-
}
if (number < 250)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 4e66d38fddf..80d77f6fbed 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -81,7 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa_manager->activate ();
orb->run ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 27a190e1702..24aa27c21e4 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -51,7 +51,6 @@ get_event_channel(int argc, ACE_TCHAR** argv)
ACE_TEXT("\n"),
argv[0]));
return 0;
-
}
}
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index fe3cf38c26d..59accd8e387 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
orb->run ();
root_poa->destroy (true, true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index d12401d49a9..487d61009a4 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
if (init_result != 0)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
index f6d64472876..82931fecd4a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
@@ -173,7 +173,6 @@ Server_i::run (void)
}
this->orb_->run ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index 3d997aea380..3fa4c48d90d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -167,7 +167,6 @@ public:
client_interceptor = interceptor;
info->add_client_request_interceptor (client_interceptor.in ());
-
}
};
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
index 5e4a71ad7b6..af5c3fe8a64 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
@@ -171,7 +171,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy();
// ACE_OS::unlink (pid_file.c_str ());
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception (ACE_TEXT ("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index 415978bcc12..d460ac4f087 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -169,7 +169,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
root_poa->destroy(1,1);
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 0f1ea1a0118..68068af2900 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
root_poa->destroy(1,1);
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index d65dd22c22e..ad7d8f3511f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -77,7 +77,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
n));
return n != 1;
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
index 2d05c7b556d..0833f106602 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -61,7 +61,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
n));
return n != 1;
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index fea63bc3cae..954d2d8c587 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -161,7 +161,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->run();
root_poa->destroy(1,1);
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
index 9bf0ef6eb77..c0c61e5e462 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
@@ -144,7 +144,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
root_poa->destroy(1,1);
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception (ACE_TEXT("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index d94bbe5cf91..5ed5aae5ca3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy ();
return 0;
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("Client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index b3a046998c2..9161b4765f4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -84,7 +84,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
}
}
return 0;
-
}
catch(const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 2a6ad20a2de..909e7e6d129 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -196,7 +196,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("(%P|%t|%T) Server %d ending serving of %C\n"),
server_num, poa_name.c_str ()));
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception (ACE_TEXT ("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 1aca6cf2a07..6577003664a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
orb->destroy ();
return 0;
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
index 1ac34448543..a0508df2a31 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
@@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
root_poa->destroy(1,1);
orb->destroy();
-
}
catch(const CORBA::Exception& ex) {
ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index ec6d7aa3de6..ea50ccb7ab0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -31,7 +31,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_.in ()));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
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 78b94429c09..56445e5a102 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -125,7 +125,6 @@ LB_server::start_orb_and_poa (void)
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to get Load Manager Reference\n"),
1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 60136341346..aaf95413fbf 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -93,7 +93,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index d83119bbc0f..c0e4eea6316 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -58,7 +58,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Removed Member at Location <%s>\n",
this->location_.in ()));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
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 88dac29fa65..1734d796f93 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
@@ -107,7 +107,6 @@ LB_server::start_orb_and_poa (void)
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to get Load Manager Reference\n"),
1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index 74fe151c85a..151c37b379e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -155,7 +155,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
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 c1fe0ef575c..56cc9b4a95f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -135,7 +135,6 @@ LB_server::start_orb_and_poa (void)
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to get Load Manager Reference\n"),
1);
-
}
catch (const CORBA::Exception& ex)
{
@@ -229,7 +228,6 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
this->orb_->object_to_string (this->object_group_.in ());
this->write_ior_to_file (ior.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index db548b84149..7fccc189e41 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -61,7 +61,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
the_string.in ()));
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index 8ec4ef7c08c..17c16dba3cd 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -39,7 +39,6 @@ Basic::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
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 6433cb05cc7..59db1435e5e 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
@@ -90,7 +90,6 @@ LB_server::start_orb_and_poa (void)
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Unable to get Load Manager Reference\n"),
1);
-
}
catch (const CORBA::Exception& ex)
{
@@ -127,7 +126,6 @@ LB_server::create_basic_object_group (void)
CORBA::String_var ior =
this->orb_->object_to_string (this->basic_object_group_.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -165,7 +163,6 @@ LB_server::create_simple_object_group (void)
CORBA::String_var ior =
this->orb_->object_to_string (this->simple_object_group_.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 3f97b2c8979..8de7c1e58d5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -39,7 +39,6 @@ Simple::remove_member (void)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
this->location_));
-
}
catch (const PortableGroup::ObjectNotFound& ex)
{
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 1fef2a2c27f..86835aaa178 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -113,7 +113,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (lb_server.destroy () == -1)
return 1;
-
}
catch (const CORBA::Exception& ex)
{
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 466a680e1df..de1ef2e5ce5 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
@@ -299,7 +299,6 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
CORBA::String_var t(str.c_str ());
record[0] <<= t.in ();
basicLog_->write_records(record);
-
}
}
@@ -323,7 +322,6 @@ BasicLog_Test::test_adminState()
this->write_records(0);
ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed. DsLogAdmin::LogLocked not thrown.\n"),-1);
-
}
catch (const DsLogAdmin::LogLocked&)
{
@@ -342,7 +340,6 @@ BasicLog_Test::test_adminState()
this->write_records(0);
ACE_DEBUG ((LM_DEBUG,"Setting administrative state to succeeded. DsLogAdmin::LogLocked not thrown.\n"));
ACE_RETURN(0);
-
}
catch (const DsLogAdmin::LogLocked&)
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index fd444d02ea0..a4471ffefbb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -130,7 +130,6 @@ Events::parse_args (int argc,
{
this->use_default_admin_ = 1;
arg_shifter.consume_arg ();
-
}
else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-events"))))
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 753ac74d846..7eded75b6ef 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -86,7 +86,6 @@ IdAssignment::init (int argc,
ACE_ERROR ((LM_ERROR,
" (%P|%t) Unable to resolve naming service !\n"));
return;
-
}
CosNaming::NamingContext_var rootNC =
CosNaming::NamingContext::_narrow (rootObj.in ());
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index e1b15e1fc3c..21bd1c6aae9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -24,7 +24,6 @@ namespace CosNotifyCommImpl{
std::cout << "event.header.fixed_header.event_type.type_name = "
<< event.header.fixed_header.event_type.type_name
<< std::endl;
-
};
void disconnect_structured_push_consumer()
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 9ae43cd8654..1e2ee3809d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -227,7 +227,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
match_structure_test (filter, event, expected_result);
orb->shutdown();
-
}
catch(...)
{
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index b9e1fd75cab..172a6306ad4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -9,7 +9,6 @@ namespace CosNotifyCommImpl{
void subscription_change( const CosNotification::EventTypeSeq&,
const CosNotification::EventTypeSeq&)
{};
-
};
}
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index f5939a0a146..22e031184df 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -162,7 +162,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
status = consumer_1->messages_received() == 1 ? 0 : 1;
ACE_DEBUG((LM_DEBUG, "Test status is %s.\n", status == 1 ? "fail" : "pass"));
-
}
}
}
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 78440bec547..ad34e9cfa75 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -11,7 +11,6 @@ namespace CosNotifyCommImpl{
void subscription_change( const CosNotification::EventTypeSeq&,
const CosNotification::EventTypeSeq&)
{};
-
};
}
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 56879cece67..9672f19024d 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -269,7 +269,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
// Create a thread-pool policy.
lanes_policy =
rt_orb->create_threadpool_policy (threadpool_id);
-
}
else if (thread_pool_static_threads_ > 0)
{
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 102a6760b16..1cb8deed507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -163,7 +163,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
sig->done ();
return 0;
-
}
catch (const CORBA::Exception& e)
{
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index d687432802d..b8c8f6c45bb 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -291,7 +291,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
////////////////////////////////
// TODO make this not hardcoded
ACE_OS::rename ("abc.xml", "loadtest.xml");
-
} // end of pass 1
if (pass2)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 5cb0902ea3a..32d9d5675a8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -151,7 +151,6 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
this->orb_->run ();
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 42a2d0a676d..1f5f98fb996 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -95,7 +95,6 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
qos.length (1);
qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
qos[0].value <<= tp_params;
-
} /* ThreadPool */
else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Lanes")) == 0) // -Lanes lane_count -Lane prio static_thr dy_thr
{
@@ -149,6 +148,5 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
qos.length (1);
qos[0].name = CORBA::string_dup (NotifyExt::ThreadPoolLanes);
qos[0].value <<= tpl_params;
-
} /* ThreadPoolLane */
}
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index d3971798566..fabecb84dc7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -83,7 +83,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
}
consumer->init_state (arg_shifter);
-
} /* -Create */
else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Subscription")) == 0) // -Subscription admin_name +added_type1 +-added_type2 ... -added_type3 -added_type4..
{
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 53fa04b748d..d1aa014c192 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -562,7 +562,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
events.dump_results();
ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
-
}
catch (const CORBA::Exception& se)
{
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 6ff51a9ec3e..f583e10c785 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -164,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ns2ref),
-1);
root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -295,7 +294,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
-1);
result_object->destroy();
root_context_1->unbind (deep);
-
}
catch (const CORBA::Exception& ex)
{
@@ -435,8 +433,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_TEXT ("Problems with resolving deep context from ")
ACE_TEXT ("redundant server - nil object ref.\n")),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 78bbc88a2ee..f720fdbabb9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -140,7 +140,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_ASSERT (priority == configs [j].thread_priority);
ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 3e18c075205..e4039ce6ef1 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -99,7 +99,6 @@ gen_objref (int argc, ACE_TCHAR *argv[])
ACE_ERROR_RETURN ((LM_ERROR,
" (%P|%t) Panic: nil RootPOA\n"),
1);
-
}
catch (const CORBA::Exception &ex)
{
@@ -165,5 +164,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
return gen_objref(argc, argv);
return parse_objref(argc, argv);
-
}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 27649c77a50..64c5acf73df 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -23,7 +23,6 @@ Client_Task::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
-
}
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
index 2f05d6995eb..f43e1449881 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -59,7 +59,6 @@ null_cipher_test (CORBA::ORB_ptr orb,
ACE_DEBUG ((LM_INFO,
"(%P|%t) Received CORBA::NO_PERMISSION from "
"server\n"));
-
}
}
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index c07ac6145d3..a41ad93f439 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -368,7 +368,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
name_service_ior_ =
orb_->object_to_string (context.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index ddde0038875..b0929b688a6 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -384,7 +384,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
name_service_ior_ =
orb_->object_to_string (context.in ());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index da30b07966e..0fc088ab8d4 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -34,7 +34,6 @@ Client_i::test_for_secure_universal_time (void)
{
CosTime::UTO_var UTO_server =
this->clerk_->secure_universal_time ();
-
}
catch (const CORBA::SystemException& sysex)
{
@@ -99,7 +98,6 @@ Client_i::test_for_new_universal_time (void)
ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 0);
ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 9999);
ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
-
}
catch (const CORBA::Exception& ex)
{
@@ -137,7 +135,6 @@ Client_i::test_for_uto_from_utc (void)
ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 50);
ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 50);
ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
-
}
catch (const CORBA::Exception& ex)
{
@@ -163,7 +160,6 @@ Client_i::test_for_new_interval (void)
ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666);
ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999);
-
}
catch (const CORBA::Exception& ex)
{
@@ -383,7 +379,6 @@ Client_i::init (int argc, ACE_TCHAR **argv)
if (this->obtain_initial_references () == -1)
return -1;
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index b7d1d806e47..2ddafeff55d 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -98,7 +98,6 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void)
str =
CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ());
-
}
catch (const CORBA::Exception& e)
{
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 7367ccf75f7..1b00b7efc57 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -121,7 +121,6 @@ int failure = 0;
TAO_Offer_Importer offer_importer(lookup_if.in(), verbose);
offer_importer.perform_queries ();
-
}; // End of Trading service scope.
//-----------------------------------------------------------------------
ACE_DEBUG ((LM_DEBUG, "*** Shutting down.\n"));
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 0518dd80ef6..7b553031a5c 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -115,7 +115,6 @@ IOR_corbaname_Client_i::init (int argc, ACE_TCHAR **argv)
"%s: Address of naming context not specified\n",
this->argv_[0]),
-1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index cafd991d555..d446e57b198 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -49,7 +49,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
// Destroy the POA, waiting until the destruction terminates
poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::SystemException& ex)
{
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index c64c7a5b63a..04e8bd1fd79 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1513,7 +1513,6 @@ Cubit_Client::run ()
for (i = 0; i < this->loop_count_; ++i)
{
this->cube_any_struct (i);
-
}
timer.stop ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 80f56b7c9f8..3236d8087c4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -241,7 +241,6 @@ Cubit_i::cube_union (const Cubit::oneof &values)
temp.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o;
temp.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s;
temp.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l;
-
}
return temp;
}
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 10da30b572c..8d6474f51ca 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -367,7 +367,6 @@ Client::get_high_priority_jitter (void)
if (stats.sample (ACE_round (*latency)) == -1)
ACE_DEBUG ((LM_DEBUG, "Error: stats.sample returned -1\n"));
-
}
// Return the square root of the sum of the differences computed
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index adefa42bb66..fffeb23c96d 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index 2273992983e..918af48016c 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -158,7 +158,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
object->_request ("shutdown");
request->invoke ();
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 4b922389878..2d189d83ab7 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -284,7 +284,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -297,7 +296,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
} // j loop
prev_poa = this->child_poa_[i].in ();
-
} // i loop
ACE_OS::fclose (this->ior_fp_);
@@ -309,7 +307,6 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
try
{
this->poa_mgr_->activate ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index 958b597b92b..783d3beb11f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -253,7 +253,6 @@ Server::svc (void)
poa_manager->activate ();
orb->run ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index a0046475528..2689271ca8c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -217,7 +217,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
throughput.dump_results (ACE_TEXT("Aggregated"), gsf);
server->shutdown ("");
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index 80a86a84e5b..d5d1921e003 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -90,7 +90,6 @@ void test_octet_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -136,7 +135,6 @@ void test_char_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -182,7 +180,6 @@ void test_long_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -228,7 +225,6 @@ void test_short_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -274,7 +270,6 @@ void test_double_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
@@ -320,7 +315,6 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
ACE_OS::gethrtime ());
if (orb->work_pending ())
orb->perform_work ();
-
}
ACE_Time_Value tv (0, 2000);
diff --git a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
index 315be6911f8..0c274c3aa5c 100644
--- a/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp
@@ -153,7 +153,6 @@ void big_time_test (CORBA::ULong num_list_loops,
str_len = list.strs.first_str.length();
list.strs.first_str.length(str_len + 1);
list.strs.first_str[str_len] = use_long_str ? long_str : short_str;
-
} // end of str loop
} // end of seq loop
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
index d39fd5283a9..b2caa8cbd73 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.cpp
@@ -91,7 +91,6 @@ Client_Task::test_octet_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -109,7 +108,6 @@ Client_Task::test_long_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -128,7 +126,6 @@ Client_Task::test_short_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -146,7 +143,6 @@ Client_Task::test_char_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -164,7 +160,6 @@ Client_Task::test_longlong_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -182,6 +177,5 @@ Client_Task::test_double_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
index 66b9d153715..3d41025d07c 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.cpp
@@ -91,7 +91,6 @@ Client_Task::test_octet_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -109,7 +108,6 @@ Client_Task::test_long_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -128,7 +126,6 @@ Client_Task::test_short_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -146,7 +143,6 @@ Client_Task::test_char_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -164,7 +160,6 @@ Client_Task::test_longlong_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
@@ -182,6 +177,5 @@ Client_Task::test_double_seq (void)
ACE_hrtime_t now = ACE_OS::gethrtime ();
this->latency_.sample (now - start);
-
}
}
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
index 180a8c53890..43156baa098 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -104,9 +104,7 @@ namespace TAO
* @c TypeCode::Alias.
*/
TypeCodeType const content_type_;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
index dcdb1c35d51..ce692d0f5e8 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -107,9 +107,7 @@ namespace TAO
* @c TypeCode::Alias.
*/
CORBA::TypeCode_ptr const * content_type_;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
index 76c3e03cdb2..807aea527bb 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -77,7 +77,6 @@ namespace TAO
virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const;
virtual CORBA::TypeCode_ptr get_compact_typecode_i () const;
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
index 0914df3a7e7..66946b70841 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -106,9 +106,7 @@ namespace TAO
/// Array of @c TAO::TypeCode enumerators representing
/// enumerators in the OMG IDL defined @c enum.
EnumeratorArrayType const enumerators_;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
index 883a328a030..ffdd07fbd74 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -112,9 +112,7 @@ namespace TAO
/// Array of @c TAO::TypeCode enumerators representing
/// enumerators in the OMG IDL defined @c enum.
char const * const * const enumerators_;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index 2b803184a4c..4751fd397d3 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -106,7 +106,6 @@ TAO::TypeCode::Objref<StringType,
{
return adapter->create_local_interface_tc (this->attributes_.id (),
"" /* empty name */);
-
}
else if (this->kind_ == CORBA::tk_native)
{
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
index c9a287ce992..900ba64df0d 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -93,7 +93,6 @@ namespace TAO
/// Base attributes (@c id and @c name).
Base_Attributes<StringType> attributes_;
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
index c3edfaa1ab3..70ebaebc80a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -100,7 +100,6 @@ TAO::TypeCode::Objref<char const *,
{
return adapter->create_local_interface_tc (this->attributes_.id (),
"" /* empty name */);
-
}
else if (this->kind_ == CORBA::tk_native)
{
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
index 60f6f3cb26c..cc967a1251a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -96,9 +96,7 @@ namespace TAO
protected:
/// Base attributes (@c id and @c name).
Base_Attributes<char const *> attributes_;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
index 23d3f429429..42eda17ed6a 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -160,7 +160,6 @@ namespace TAO
/// Track whether data has been initialized.
bool data_initialized_;
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
index 4d4fc40f1ad..a8d2deab6f7 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
@@ -69,7 +69,6 @@ namespace TAO
return tc;
}
};
-
} // End namespace TypeCodeFactory
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
index 2103872c83a..a8911809dfc 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -124,7 +124,6 @@ namespace TAO
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
index 4d87a18a9de..f335deba01d 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -125,7 +125,6 @@ namespace TAO
CORBA::TypeCode_ptr const *> const * const fields_;
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
index f47fff4f8ef..4ba49fe0b94 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
@@ -225,7 +225,6 @@ namespace TAO
CORBA::TypeCode_ptr & tc,
TC_Info_List & indirect_infos,
TC_Info_List & direct_infos);
-
} // End namespace TypeCodeFactory
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
index a5ce4e5cc91..87de72be46e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -145,7 +145,6 @@ namespace TAO
};
typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
index 04959f3a17a..d23aaa6b247 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h
@@ -84,7 +84,6 @@ namespace TAO
/// IDL @c union discriminator typecode.
CORBA::TypeCode_var discriminator_tc_;
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
index 7bee7becd9a..640b057fbfc 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.cpp
@@ -63,7 +63,6 @@ namespace TAO
return CORBA::Any::to_char (v);
}
};
-
} // End TypeCode namespace
} // End TAO namespace
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
index dfe60630445..aabcba87c2e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
@@ -78,9 +78,7 @@ namespace TAO
/// The @c CORBA::TypeCode of the field.
TypeCodeType type;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Traits.h b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
index 241a0f0f45d..09ff1a79480 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
@@ -112,7 +112,6 @@ namespace TAO
}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
index 1d7b5d7a96c..98152b0fde2 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
@@ -82,9 +82,7 @@ namespace TAO
/// The visibility of the field.
CORBA::Visibility visibility;
-
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 71edaa36fa5..83077b06840 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -141,7 +141,6 @@ namespace TAO
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
index 8aa80cbc216..998cbd61959 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -142,7 +142,6 @@ namespace TAO
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h
index 6d7a8bb7f38..ebbfa261946 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -142,7 +142,6 @@ namespace TAO
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
index 46f3d498818..06a7d9f77d5 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -140,7 +140,6 @@ namespace TAO
//@}
};
-
} // End namespace TypeCode
} // End namespace TAO
diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp
index e2952ff3569..cb519752e1d 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -179,7 +179,6 @@ TAO_Asynch_Queued_Message::destroy ()
{
ACE_DES_FREE_THIS (this->allocator_->free,
TAO_Asynch_Queued_Message);
-
}
else // global release..
{
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 3267f210d56..c0c383ae746 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -226,7 +226,6 @@ TAO_OutputCDR::throw_skel_exception (int error_num )
default :
throw ::CORBA::MARSHAL (0, CORBA::COMPLETED_YES);
-
}
}
@@ -345,7 +344,6 @@ TAO_InputCDR::throw_skel_exception (int error_num )
default :
throw ::CORBA::MARSHAL();
-
}
}
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
index 7e3e73166ca..a61ad5f52a3 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -109,7 +109,6 @@ namespace TAO
/// Pointer to the underlying TAO_ServerRequest object.
TAO_ServerRequest* request_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
index 877bd07ada1..7bd8aa02349 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
@@ -68,7 +68,6 @@ namespace TAO
/// servant if only requests targeting that servant should be cancelled.
PortableServer::ServantBase_var servant_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
index fd0004f2e3e..6cfd276f2ea 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
@@ -70,7 +70,6 @@ namespace TAO
/// Cancel the request.
virtual void cancel_i();
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
index 86c7dd93023..2dfc943df14 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
@@ -86,7 +86,6 @@ namespace TAO
/// exception is raised from the dispatch() call on the server_request_.
CORBA::Exception* exception_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
index 934d46e3242..531298490e5 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
@@ -87,7 +87,6 @@ namespace TAO
/// wait() method.
TP_Synch_Helper synch_helper_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
index dd63621c7f4..1711dca3987 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
@@ -58,7 +58,6 @@ namespace TAO
/// Cancel the request.
virtual void cancel_i();
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
index 09b0d8e4eb7..ec4d201178b 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
@@ -58,7 +58,6 @@ namespace TAO
private:
TP_Custom_Request_Operation_Handle op_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
index 15f925831bc..d3a644e3c24 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
@@ -76,7 +76,6 @@ namespace TAO
private:
PortableServer::ServantBase_var servant_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
index d8d07c5bdf3..81847c58d25 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
@@ -58,7 +58,6 @@ namespace TAO
/// Default Constructor.
TP_Queue_Visitor();
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
index 38407bcf8cd..29079cf5ff3 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
@@ -82,7 +82,6 @@ namespace TAO
/// Cancel the request.
virtual void cancel_i();
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
index da68cdf8f81..f1db7dc6309 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
@@ -73,7 +73,6 @@ namespace TAO
/// The servant's current "busy" state (true == busy, false == not busy)
bool busy_flag_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
index 932e66b5182..c36802cd071 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
@@ -71,7 +71,6 @@ namespace TAO
/// The underlying map of servant state objects.
MapType map_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
index 285b74b0f74..857d4da528e 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
@@ -180,7 +180,6 @@ namespace TAO
/// "serialize servants" flag is set to true.
TP_Servant_State_Map servant_state_map_;
};
-
}
}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
index c2d08d1542a..f23ff0fa9eb 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
@@ -103,7 +103,6 @@ TAO::CSD::TP_Strategy_Factory::init (int argc,
-1);
CSD_Framework::Strategy_var objref = strategy;
repo->add_strategy (poa_name, strategy);
-
}
else
{
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
index b4a9dab0545..c80121e2641 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
@@ -148,7 +148,6 @@ namespace TAO
enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 };
};
-
}
}
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index 7e2bb105151..b4c843e436b 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -114,7 +114,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
default:
throw IOP::CodecFactory::UnknownEncoding ();
-
}
return codec;
diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
index c475e9917ec..95bd5e40504 100644
--- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
+++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp
@@ -38,7 +38,6 @@ Zlib_CompressorFactory::get_compressor (
}
compressor = (*it).second.in();
-
} catch (...) {
TAOLIB_ERROR_RETURN((LM_ERROR,
ACE_TEXT("(%P | %t) ERROR: ZlibCompressor - Unable to create Zlib Compressor at level [%d].\n"),
diff --git a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
index e2c8a061d7d..76997783c04 100644
--- a/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_ORBInitializer.cpp
@@ -120,7 +120,6 @@ TAO_DTP_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
dtp_tlrm.tp_manager().create_threadpool (def);
tao_info->orb_core ()->leader_follower ().set_avoid_client_leader ();
-
}
diff --git a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
index ab7e89fb297..ea0088f136c 100644
--- a/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
+++ b/TAO/tao/Dynamic_TP/DTP_POA_Strategy.cpp
@@ -93,7 +93,6 @@ TAO_DTP_POA_Strategy::poa_activated_event_i (TAO_ORB_Core& orb_core)
ACE_TEXT ("TAO (%P|%t) - DTP_POA_Strategy - ")
ACE_TEXT ("warning: config not found...using ")
ACE_TEXT ("defaults!\n")));
-
}
this->set_dtp_config (config_entry);
//this->dtp_task_.set_init_pool_threads(config_entry.init_threads_);
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h
index 3acfb76eb97..9ad1e75ee50 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.h
+++ b/TAO/tao/FoxResource/FoxResource_Loader.h
@@ -48,7 +48,6 @@ namespace TAO
FoxResource_Loader (FXApp *app);
virtual ~FoxResource_Loader (void);
-
};
}
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 6e3caeaaa8b..5b8b99b641d 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -141,7 +141,6 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
return -1;
-
}
return 0;
@@ -580,7 +579,6 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
// Set the <rd_ptr> of the <incoming>..
qd->msg_block ()->rd_ptr (copy_len);
-
}
return 0;
diff --git a/TAO/tao/HTTP_Handler.cpp b/TAO/tao/HTTP_Handler.cpp
index 6469ed1bf9e..a2b9b3a2c10 100644
--- a/TAO/tao/HTTP_Handler.cpp
+++ b/TAO/tao/HTTP_Handler.cpp
@@ -133,7 +133,6 @@ TAO_HTTP_Reader::receive_reply ()
// Determine number of data bytes read. This is equal to the
// total bytes read minus number of header bytes.
bytes_read = num_recvd - (buf_ptr - buf);
-
}
else
{
@@ -182,7 +181,6 @@ TAO_HTTP_Reader::receive_reply ()
// Increment bytes_read
bytes_read += num_recvd;
-
}
else
{
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 64358da1313..fd9528b3c6b 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -546,7 +546,6 @@ TAO_IIOP_Profile::to_string () const
digits [this->version_.minor],
endp->host (),
endp->port () );
-
}
ACE_OS::sprintf (buf + std::strlen(buf),
"%c%s",
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f6240e35da4..5c466630ad7 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -117,7 +117,6 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
stub->is_collocated (),
stub->collocated_servant ()),
CORBA::Object::_nil ());
-
}
return result;
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 78b9eaafbfd..ca07272ecba 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -277,7 +277,6 @@ namespace TAO
resolver,
max_wait_time,
retry_state);
-
}
}
return TAO_INVOKE_FAILURE;
diff --git a/TAO/tao/Invocation_Retry_State.cpp b/TAO/tao/Invocation_Retry_State.cpp
index f950d69bb67..3c2564db0eb 100644
--- a/TAO/tao/Invocation_Retry_State.cpp
+++ b/TAO/tao/Invocation_Retry_State.cpp
@@ -69,7 +69,6 @@ namespace
command_line_params,
client_factory_params,
result);
-
}
}
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
index 052dcd75da7..88bfcfc8c3c 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -96,7 +96,6 @@ namespace TAO
Asynch_Invocation_Adapter () = delete;
Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &) = delete;
Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &) = delete;
-
};
} // End namespace TAO
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 563beba019f..3596704e008 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -3511,7 +3511,6 @@ TAO_ORB_Core::add_interceptor (
this->client_request_interceptor_adapter_->add_interceptor (
interceptor,
policies);
-
}
else
{
@@ -3535,7 +3534,6 @@ TAO_ORB_Core::add_interceptor (
this->server_request_interceptor_adapter_->add_interceptor (
interceptor,
policies);
-
}
else
{
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index 70fc568a48f..f916b637c00 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -38,7 +38,6 @@ namespace TAO
public:
typedef void ret_type;
typedef RetArgument ret_val;
-
};
/**
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
index 7eb163a3c48..a3bfc8e440a 100644
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -60,7 +60,6 @@ namespace TAO
/// Timestamp
CORBA::ULong time_stamp_[2];
-
};
/**
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index e57fde4a932..575c22be156 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -60,7 +60,6 @@ namespace TAO
private:
/// Reference to the "IN" argument.
S x_;
-
};
// ------------------------------------------------------------
@@ -134,7 +133,6 @@ namespace TAO
private:
S x_;
-
};
// ------------------------------------------------------------
@@ -171,7 +169,6 @@ namespace TAO
private:
S x_;
-
};
// ------------------------------------------------------------
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
index 5b1c7ba96eb..15e212c64ab 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -43,7 +43,6 @@ namespace TAO
virtual ::PortableServer::IdUniquenessPolicyValue type() const;
};
-
}
}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
index ba910f7dc0f..26450fc1f6f 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -48,7 +48,6 @@ namespace TAO
private:
TAO_Root_POA* poa_;
};
-
}
}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
index d02e0060b4f..f5dfc25b016 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -36,7 +36,6 @@ namespace TAO
virtual void destroy (IdUniquenessStrategy *strategy);
};
-
}
}
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
index 6aaa52a0bdf..01a9a150dbd 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -81,7 +81,6 @@ namespace TAO
protected:
TAO_Root_POA *poa_;
};
-
} /* namespace Portable_Server */
} /* namespace TAO */
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 4143e3f2864..c041333d425 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -289,7 +289,6 @@ public:
virtual int unbind_persistent_poa (const poa_name &folded_name,
const poa_name &system_name);
-
};
friend class No_Hint_Strategy;
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index 89123a4c71d..a2ea413e806 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1971,7 +1971,6 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
collocated,
servant),
CORBA::INTERNAL ());
-
}
else
{
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
index eb54dc6520a..6873a3b8028 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -115,7 +115,6 @@ namespace TAO
virtual ::PortableServer::ServantRetentionPolicyValue type() const = 0;
virtual TAO_Active_Object_Map * get_active_object_map() const = 0;
-
};
}
}
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index db903e39819..ecad0576c2e 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -352,7 +352,6 @@ namespace TAO
this->poa_->cleanup_servant (
this->active_object_map_entry_->servant_,
this->active_object_map_entry_->user_id_);
-
}
catch (...)
{
diff --git a/TAO/tao/Queued_Data.cpp b/TAO/tao/Queued_Data.cpp
index d7c86459964..9d4de42386f 100644
--- a/TAO/tao/Queued_Data.cpp
+++ b/TAO/tao/Queued_Data.cpp
@@ -86,7 +86,6 @@ TAO_Queued_Data::make_queued_data (ACE_Allocator *message_buffer_alloc,
message_buffer_alloc->malloc (sizeof (TAO_Queued_Data))),
TAO_Queued_Data (message_buffer_alloc),
nullptr);
-
}
else
{
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 9db98ee6a33..7ae293e3450 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -226,7 +226,6 @@ TAO_RT_Invocation_Endpoint_Selector::endpoint_from_profile (
"Unable to access RT CORBA Priority in client thread "
"accessing object with CLIENT_PROPAGATED priority model.\n"));
throw CORBA::DATA_CONVERSION (CORBA::OMGVMCID | 2, CORBA::COMPLETED_NO);
-
}
// If there are no bands.
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 453572829f9..5616f392b75 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -630,7 +630,6 @@ TAO_ClientProtocolPolicy::_tao_decode (TAO_InputCDR &in_cdr)
&& (this->protocols_[i].transport_protocol_properties.ptr () != 0))
is_read_ok =
this->protocols_[i].transport_protocol_properties->_tao_decode (in_cdr);
-
}
return is_read_ok;
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 930fa49f2db..3bcdb7faf13 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -340,7 +340,6 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
this->name_ = CORBA::string_dup (name);
this->sched_param_ = CORBA::Policy::_duplicate (sched_param);
this->implicit_sched_param_ = CORBA::Policy::_duplicate (implicit_sched_param);
-
}
else //Nested segment
{
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index a69afc6dccc..498863bed1b 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -66,7 +66,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
TAOLIB_DEBUG ((LM_DEBUG,
"No Scheduling Segment Context\n"));
throw ::CORBA::INTERNAL ();
-
}
// @@ Store implicit_sched_param in a var
@@ -90,7 +89,6 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
// Install new current in the ORB.
//current->implementation (new_current);
tss->rtscheduler_current_impl_ = new_current;
-
}
// Scheduler populates the service context with
@@ -407,7 +405,6 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
// Reset the previous current pointer.
tss->rtscheduler_previous_current_impl_ = 0;
-
}
else TAOLIB_DEBUG ((LM_DEBUG,
"Send Reply Current is 0\n"));
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index b362e145a27..d72faabb28b 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -438,7 +438,6 @@ TAO_DIOP_Profile::to_string () const
digits [this->version_.minor],
endp->host (),
endp->port ());
-
}
ACE_OS::sprintf (buf + ACE_OS::strlen (buf),
"%c%s",
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 73b72faa964..49819d0f4eb 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -295,7 +295,6 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core,
// Set the length of the hostname
hostname_length = port_separator_loc - address;
-
} else {
// Port separator was not found. We allow port_number to retain
// the value of 0, which will cause the port to be chosen for us
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
index c538040a969..463ca2f9dc0 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -421,7 +421,6 @@ TAO_SCIOP_Connection_Handler::set_tos (int tos)
// On successful setting of TOS field.
if (result == 0)
this->dscp_codepoint_ = tos;
-
}
return 0;
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index b3529e2ea53..3dc066cece3 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -133,7 +133,6 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
ACE_TEXT("TAO_Advanced_Resource_Factory::init - ")
ACE_TEXT("-ORBReactorRegistry no longer supported\n")),
-1);
-
}
else if (0 != (current_arg = arg_shifter.get_the_parameter
(ACE_TEXT("-ORBReactorLock"))))
@@ -376,7 +375,6 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
#endif /* TAO_HAS_COIOP && TAO_HAS_COIOP != 0 */
return 0;
-
}
for (; factory != end; factory++)
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index ee073e085d3..1d838b88888 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -394,7 +394,6 @@ namespace TAO
this->stub()->orb_core ()->service_raise_comm_failure (
this->details_.request_service_context ().service_info (),
this->resolver_.profile ());
-
}
catch (const ::CORBA::Exception&)
{
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index da33bba0612..2bbabd9ddc0 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -118,7 +118,6 @@ namespace TAO
* This method returns an exception when there is an error.
*/
Invocation_Status check_reply_status (TAO_Synch_Reply_Dispatcher &rd);
-
};
/**
diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp
index fb5122c0aea..4357b01f644 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -160,7 +160,6 @@ TAO_Synch_Queued_Message::destroy ()
{
ACE_DES_FREE_THIS (this->allocator_->free,
TAO_Synch_Queued_Message);
-
}
else // global release..
{
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 23668c5a517..fe76c2aec9b 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -408,7 +408,6 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
ACE_TEXT ("TAO (%P|%t) - The default ")
ACE_TEXT ("ORB must have completed the global ")
ACE_TEXT ("initialization...\n")));
-
}
else
{
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 6a3853353e3..8f5ba8ab4c7 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -533,7 +533,6 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
TAOLIB_ERROR ((LM_ERROR,
ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
ACE_TEXT ("could not make cached reply\n")));
-
}
/// Append reply here....
diff --git a/TAO/tao/TkResource/TkResource_Loader.h b/TAO/tao/TkResource/TkResource_Loader.h
index 99e80c01f98..bb2dfecb152 100644
--- a/TAO/tao/TkResource/TkResource_Loader.h
+++ b/TAO/tao/TkResource/TkResource_Loader.h
@@ -46,7 +46,6 @@ namespace TAO
TkResource_Loader (void);
virtual ~TkResource_Loader (void);
-
};
}
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 21984df8da6..a63904aef9f 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1696,7 +1696,6 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ")
ACE_TEXT ("error while parsing the head of the queue\n"),
this->id()));
-
}
return -1;
}
@@ -1827,7 +1826,6 @@ TAO_Transport::consolidate_process_message (TAO_Queued_Data *q_data,
}
TAO_Queued_Data::release (q_data);
-
}
return 0;
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 7b2c1e4db15..7f40300e128 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -89,7 +89,6 @@ namespace TAO
// The ORB's TSS slot id for the Transport ptr
size_t tss_slot_id_;
};
-
}
}
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index 58ee8590810..b2470e88e70 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -43,7 +43,6 @@ namespace TAO
/// Protected destructor to enforce reference counting discipline
virtual ~Current_Loader (void);
};
-
}
}
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index f47317b4790..8e78130a616 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -51,7 +51,6 @@ namespace TAO
Current_ORBInitializer_Base (const Current_ORBInitializer_Base &) = delete;
Current_ORBInitializer_Base &operator = (const Current_ORBInitializer_Base &) = delete;
};
-
} /* namespace Transport */
} /* namespace TAO */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index c5301cece9c..d6bc8c45860 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -52,7 +52,6 @@ namespace TCF
CORBA::TypeCode_var,
field_array_type>
recursive_typecode_type;
-
} // End namespace Struct
namespace Union
diff --git a/TAO/tao/Utils/Implicit_Deactivator.h b/TAO/tao/Utils/Implicit_Deactivator.h
index ca2e2051ed5..2a7f9d4e763 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -49,7 +49,6 @@ namespace TAO
PortableServer::ServantBase,
Implicit_Deactivation_Functor>
Implicit_Deactivator;
-
} // namespace Utils
} // namespace TAO
diff --git a/TAO/tao/Utils/ORB_Destroyer.h b/TAO/tao/Utils/ORB_Destroyer.h
index fba3313200a..e6febb40611 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -48,7 +48,6 @@ namespace TAO
CORBA::ORB,
ORB_Destroyer_Functor>
ORB_Destroyer;
-
} // namespace Utils
} // namespace TAO
diff --git a/TAO/tao/Utils/PolicyList_Destroyer.h b/TAO/tao/Utils/PolicyList_Destroyer.h
index 639919637fb..821ba11dbb7 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.h
+++ b/TAO/tao/Utils/PolicyList_Destroyer.h
@@ -36,7 +36,6 @@ namespace TAO
PolicyList_Destroyer(CORBA::ULong length_hint);
~PolicyList_Destroyer() throw ();
};
-
} // namespace Utils
} // namespace TAO
diff --git a/TAO/tao/Utils/RIR_Narrow.h b/TAO/tao/Utils/RIR_Narrow.h
index 573720023fe..be31d6efa04 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -52,7 +52,6 @@ namespace TAO
private:
static _ptr_type narrow_object (CORBA::Object_ptr object);
};
-
} // namespace Utils
} // namespace TAO
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index 5741902c931..bbfcbeb0073 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -55,7 +55,6 @@ namespace TAO
/*! @copydoc TAO_Wait_Strategy::defer_upcall() */
virtual int defer_upcall (ACE_Event_Handler*);
-
};
}
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index e51280730e5..c702393d69c 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -1129,7 +1129,6 @@ TAO_Default_Resource_Factory::create_fragmentation_strategy (
ACE_NEW_RETURN (strategy,
TAO_Null_Fragmentation_Strategy,
strategy);
-
}
else
{
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 0a9b2bf4c59..401f345bb5a 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -127,7 +127,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 1afcd61030d..d9416804bc3 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -161,7 +161,6 @@ TimeoutClient::send (CORBA::Boolean async,
// Trap this exception and continue...
ACE_DEBUG ((LM_DEBUG,
" timeout "));
-
}
// get rid of the policy, you created before.
diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp
index 780738d3232..b7751a8c753 100644
--- a/TAO/tests/Alt_Mapping/client.cpp
+++ b/TAO/tests/Alt_Mapping/client.cpp
@@ -105,7 +105,6 @@ Alt_Mapping_Client<T>::run_sii_test (void)
"run_sii_test exception in iteration %d",
i));
goto loop_around;
-
}
if (!this->test_object_->check_validity ())
diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp
index da6e7f6e0ff..829a8834d05 100644
--- a/TAO/tests/Alt_Mapping/driver.cpp
+++ b/TAO/tests/Alt_Mapping/driver.cpp
@@ -91,7 +91,6 @@ Driver::init (int argc, ACE_TCHAR **argv)
ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
this->objref_ = Alt_Mapping::_narrow (temp.in());
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
index 95673f39d4b..771849b9cd3 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -87,7 +87,6 @@ Test_Unbounded_Struct_Sequence::run_sii_test (
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 8a333958ed6..8ea1c79868a 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
orb->run ();
root_poa->destroy (true, true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 7e84160fe48..7c14fc00199 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -137,7 +137,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
server->shutdown ();
root_poa->destroy (true, true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 088b74d2433..6730ae08be9 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -171,7 +171,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
session_list[j]->start (other_sessions);
-
}
ACE_DEBUG ((LM_DEBUG ,"done\n"));
@@ -196,7 +195,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
for (j = 0; j != peer_count; ++j)
{
session_list[j]->destroy ();
-
}
ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 29ee60a3bdf..845bf6af72c 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -192,7 +192,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
for (j = 0; j != peer_count; ++j)
{
session_list[j]->destroy ();
-
}
ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 873e414d900..e3e80c625f6 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -150,7 +150,6 @@ Thread_Pool::svc (void)
pload.length (10);
ACE_OS::memset (pload.get_buffer(), pload.length(), 0);
echo->echo_payload (pload);
-
}
else
#endif /*if 0*/
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index a0d3ff9494b..3b55807be47 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -149,7 +149,6 @@ test_no_implicit_activation (
// Implicit activation should fail
Test_var myservant =
myhello._this ();
-
}
catch (const PortableServer::POA::WrongPolicy& )
{
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index bde40aa87ad..6ce82f6dbf0 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
"ERROR: Extracted value not equal "
"to the encoded value\n"),
-1);
-
}
ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 760e604f85c..172238de6b5 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
atobj->a_charArray (char_array.in ());
ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n"));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 607fe5ff843..bdce1f67b07 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -37,7 +37,6 @@ class Reply_Handler
ACE_DEBUG ((LM_DEBUG,
"client: parentMethod reply %d @ %T\n",
++parentMethod_count));
-
}
virtual void
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 183a0b9f114..60590fba8fb 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -42,7 +42,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
cout << "The price of a stock in \"" << full_name.in () << "\" is $" << price << endl;
cout << " history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << endl ;
-
} catch (Quoter::Invalid_Stock_Symbol &) {
cerr << "Invalid stock symbol <" << argv[i] << ">" << endl;
}
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index b01a90b4eee..22b5f692ac5 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -95,7 +95,6 @@ Worker::svc()
ACE_Time_Value udelay(0,400);
struct timespec ts = udelay;
ACE_OS::nanosleep (&ts);
-
}
catch (const CORBA::Exception &ex)
{
@@ -280,7 +279,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
init_callback(worker);
-
}
catch (const CORBA::Exception &ex)
{
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index 8171f77019c..009ca878c1e 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -145,7 +145,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
poa_var->destroy (1,0);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index fa6bb4d539c..cdba93ea310 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -131,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
pinger.wait();
ACE_DEBUG ((LM_DEBUG,"(%P|%t) client done\n"));
-
}
catch (const CORBA::Exception &ex)
{
diff --git a/TAO/tests/Bug_2935_Regression/source_i.cpp b/TAO/tests/Bug_2935_Regression/source_i.cpp
index dec6db49ea3..e70de79322a 100644
--- a/TAO/tests/Bug_2935_Regression/source_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/source_i.cpp
@@ -38,7 +38,6 @@ Source_i::run ()
(int)tickCount, (int)tockCount));
target_->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 92c4e1532bb..dbdebb13338 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
1);
worker.thr_mgr ()->wait ();
-
}
ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
}
diff --git a/TAO/tests/Bug_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp
index 3367db61380..5f91c4258e6 100644
--- a/TAO/tests/Bug_3506_Regression/client.cpp
+++ b/TAO/tests/Bug_3506_Regression/client.cpp
@@ -97,7 +97,6 @@ public:
ACE_ERROR_RETURN ((LM_DEBUG,
"Reference is not of type IF_EXE_M_R::IF_ExeCtrlData\n"),
1);
-
}
client->foo (ts);
if (shutdown)
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index 7ca7b21c08a..e16cafeb09e 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -52,7 +52,6 @@ public:
ts.whatEver._tao_get_typecode()->id(),
ts.whatEver._tao_get_typecode()->name(),
ts.whatEver._tao_get_typecode()->kind()));
-
}
else
{
diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp
index 5748d90de35..7e05d4d9de1 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3531_Regression/test_i.cpp
@@ -35,7 +35,6 @@ Simple_Server_i::test_method (Simple_Server_ptr objref)
"which will sleep for 3 seconds\n"));
CORBA::String_var str = objref->test_method (_this());
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Received \"%C\"\n", str.in ()));
-
}
catch (...)
{
diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp
index c01796bd2c4..8f83f1a53d4 100644
--- a/TAO/tests/Bug_3672_Regression/client.cpp
+++ b/TAO/tests/Bug_3672_Regression/client.cpp
@@ -270,7 +270,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
{
ex._tao_print_exception ("Caught exception:");
return 1;
-
}
return parameter_corruption;
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 85475c11224..8ecb7692921 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -309,8 +309,6 @@ Client<ServerInterface>::init (const char *,
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("no ior or naming options specified\n")),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index fc00327e5f5..61e4e94f853 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -187,7 +187,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
++result;
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index d2f3d5830ab..5ff11f23e7b 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
if (!quiet)
ACE_OS::printf ("AVE: %d %f\n",
i, average);
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index 76f15b8057c..6220eeda46c 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -92,7 +92,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
return 0;
-
}
int
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 9aaf7b50507..86f0234cdc4 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -73,7 +73,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
return 0;
-
}
int
diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp
index 3ce87e99c89..8de90b314a4 100644
--- a/TAO/tests/Compression/RLECompressorTest.cpp
+++ b/TAO/tests/Compression/RLECompressorTest.cpp
@@ -196,7 +196,6 @@ static int init_compressor(::CORBA::ORB_ptr orb)
Compression::CompressorFactory_var compr_fact = compressor_factory;
manager->register_factory (compr_fact.in ());
-
} catch (...) {
ACE_ERROR_RETURN((LM_ERROR,
ACE_TEXT("ERROR: Unable to initialise RLE compressor manager.\n")),-1);
@@ -568,7 +567,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
ACE_DEBUG((LM_INFO, ACE_TEXT("TAO::RLECompression Ratio = %f : 1\n"), tao_ratio));
orb->shutdown ();
-
} catch (const CORBA::Exception& ex) {
ex._tao_print_exception ("RLECompressorTest: UNEXPECTED exception - ");
return -1;
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index 3d1588d4a80..467676c1830 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -118,5 +118,4 @@ DII_ReplyHandler::handle_location_forward (TAO_InputCDR &incoming,
req->add_in_arg ("text") <<= CORBA::Any::from_string(test_string.in(),30);
req->sendc(this);
-
}
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index 4514bbe40e9..f1cfbec1038 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -203,8 +203,6 @@ Client_Task::svc (void)
req = obj->_request ("shutdown");
req->send_oneway ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index f606a470b9b..340f5d9b3a2 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -275,8 +275,6 @@ Client_Task::svc (void)
req = obj->_request ("shutdown");
req->send_oneway ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index 9f6dbfeefb3..eda5079b763 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -69,7 +69,6 @@ UDP_Client_i::svc (void)
// Shut down local ORB, trigger the end of the ORB event loop
// in the main thread.
orb_->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 8d54d570503..b93e888e36c 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -179,7 +179,6 @@ Test_Client_Module::svc (void)
// is used, i.e. one isn't explicitly loaded prior to initializing
// the ORB.
(void) this->test_.out ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 22f195a7961..0ea3edfc135 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -89,7 +89,6 @@ Driver::init (int argc, ACE_TCHAR *argv[])
"(%N:%l) driver.cpp - "
"parse_args failed\n"),
-1);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
index e31abbae306..1361b7cfd31 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
@@ -112,8 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
root_poa->destroy (true, true);
orb->destroy ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index 8a860e19ad8..57f789cdc5f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -190,8 +190,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
root_poa->destroy (true, true);
orb->destroy ();
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 9201a12b92e..be292821e7f 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -192,7 +192,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
(pb[i].high != rt_properties->priority_bands ()[i].high)))
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Mismatching Priority Band Range!\n")));
-
}
}
}
@@ -211,7 +210,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("\nThe Client Protocol Type: %d\n"),
protocol_list[i].protocol_type));
-
}
}
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 8f90aef7cfc..350a5a8a7ca 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -49,7 +49,6 @@ RT_Properties::read_from (const ACE_TCHAR *file_name)
ACE_UNUSED_ARG (n_matched);
rt_properties->priority_bands_.length (int_field);
-
}
else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0)
{
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 8d12a41c115..e935a3990ef 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -168,7 +168,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
root_poa->destroy (true, true);
-
}
catch (const CORBA::COMM_FAILURE& x)
{
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index ae995dcc6c6..bf9df187fbc 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -122,7 +122,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n"));
root_poa->destroy (true, true);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 406b9968117..c087183bf73 100644
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -207,7 +207,6 @@ Worker::svc (void)
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) unexpected result = %d\n",
r));
-
}
catch (const CORBA::OBJECT_NOT_EXIST &)
{
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index e568d3dda7d..2aa6f4a118b 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -209,7 +209,6 @@ namespace Test
ACE_Thread_Manager::instance ()->wait ();
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 581666b8b26..0ae36756d03 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -201,7 +201,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// Finally generate an exception and quit.
// This will generate a NotFound exception.
in_count = iorm->is_in_ior (just2.in (), name1.in ());
-
}
catch (const TAO_IOP::EmptyProfileList& userex)
{
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 27649c77a50..64c5acf73df 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/Client_Task.cpp
@@ -23,7 +23,6 @@ Client_Task::svc (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
-
}
ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
index 104c80b2034..362d4ab9cb3 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
@@ -201,7 +201,6 @@ Worker::svc (void)
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) unexpected result = %d\n",
r));
-
}
catch (const CORBA::OBJECT_NOT_EXIST &)
{
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 331d2929eb5..5005fe0a71a 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -278,7 +278,6 @@ SelfClient::svc (void)
{
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Not found it\n"));
-
}
else
{
@@ -295,7 +294,6 @@ SelfClient::svc (void)
// Just make a call
this->server_->test_method (i);
-
}
}
catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 9a4d50cc28b..826349cd30e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -42,7 +42,6 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr)
ACE_Time_Value pause(0, usecs);
ACE_OS::sleep(pause);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index ab5273dcd11..cf08b7f0dee 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -187,7 +187,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp
index 120703e5fcd..78b97b1efd8 100644
--- a/TAO/tests/OBV/Indirection/MessengerClient.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp
@@ -86,7 +86,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
}
orb->destroy();
-
} catch(const CORBA::Exception& e) {
std::cerr << e << std::endl;
return 1;
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 3b5070f3c05..4f75ce7bbad 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -259,8 +259,6 @@ Client<InterfaceObj, Var>::init (const char *name,
ACE_ERROR_RETURN ((LM_ERROR,
"no ior or naming options specified\n"),
-1);
-
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index dea938ec420..bce89aa4c2b 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -175,7 +175,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_ASSERT (test_graph->size () == 6);
my_test->pass_obj_graph_inout (test_graph.inout ());
ACE_ASSERT (test_graph->size () == 7);
-
}
my_test->finish ();
@@ -185,7 +184,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
orb->destroy ();
ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 8d995b4842b..c82ad1d6853 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1165,7 +1165,6 @@ int test_boxed_array_invocations (Test * test_object)
p4->_remove_ref ();
p5->_remove_ref ();
p6->_remove_ref ();
-
}
catch (const CORBA::Exception& ex)
{
@@ -1395,7 +1394,6 @@ int test_boxed_union_invocations (Test * test_object)
p4->_remove_ref ();
p5->_remove_ref ();
p6->_remove_ref ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
index 168021f9f20..d33a9071f03 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
@@ -67,7 +67,6 @@ testBug3049 (int , ACE_TCHAR *[])
if (error > 0)
return -1;
-
}
catch(const CORBA::Exception& ex)
{
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 22d0339e8ec..a58a78a46f1 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
root_poa->destroy (true, true);
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index fc56e946f15..65ad651ab78 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -103,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Calling shutdown\n"));
server->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index ce1a086c0a5..47e8bdf21fe 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -131,7 +131,6 @@ Client::init (int argc, ACE_TCHAR* argv[])
policy_list[0]->destroy ();
policy_list[1]->destroy ();
policy_list.length(0);
-
}
catch( CORBA::Exception& ex) {
ACE_ERROR ((LM_ERROR, "(%P|%t) Client::Init> Caught CORBA::Exception %s"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
index d4757949f57..86caa6f0a56 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -201,7 +201,6 @@ Server::shutdown ()
catch( CORBA::Exception& ex) {
ACE_ERROR ((LM_ERROR, "(%P|%t) Server::run> Caught CORBA::Exception %s"
, ex._info().c_str()));
-
}
shutdown_ = true;
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 9aea898d1c0..c08515ff8ad 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -121,7 +121,6 @@ Server_i::init (int argc, ACE_TCHAR **argv)
// Get the POAManager of RootPOA
poa_manager_ = root_poa_->the_POAManager ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
index 8d7e87ee689..da78afe52c6 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
@@ -90,7 +90,6 @@ Server_Task::svc (void)
first_poa = root_poa->create_POA (name.c_str (),
poa_manager.in (),
policies);
-
}
// Destroy the policy objects as they have been passed to
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index f375dca2cb6..0d892a9bcc6 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -148,7 +148,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
first_poa = root_poa->create_POA (name.c_str (),
poa_manager.in (),
policies);
-
}
PortableServer::POA_var second_poa;
@@ -165,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
second_poa = root_poa->create_POA (name.c_str (),
poa_manager.in (),
policies);
-
}
// Destroy the policy objects as they have been passed to
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index b920ffbfda4..897aab72173 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -126,7 +126,6 @@ Server_i::init (int argc, ACE_TCHAR **argv)
// Get the POAManager of RootPOA
poa_manager_ = root_poa_->the_POAManager ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 665479c78e3..8616f65d5e4 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -128,7 +128,6 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_Array_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 7354e5c44b6..1e7190fd7ea 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -115,7 +115,6 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_Long_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 4e0a2cf1bbd..a87ad18369c 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -121,7 +121,6 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_Short_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index a8f73b80538..fadfb85b3e4 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -113,7 +113,6 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_String_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 4295ab113cb..c9062c29397 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -126,7 +126,6 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_String::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index c91122d68ab..76456620945 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -119,7 +119,6 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_Struct_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 544840dd110..6b52e20bf89 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -113,7 +113,6 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_WString_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index eab4463dedc..904158bd400 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -127,7 +127,6 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Bounded_WString::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 044f92400d0..edaac0d77f3 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -228,7 +228,6 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Big_Union::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 94c090ff8ca..6fa43b8100d 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -105,7 +105,6 @@ Param_Test_Client<T>::run_sii_test (void)
"run_sii_test exception in iteration %d",
i));
goto loop_around;
-
}
if (!this->test_object_->check_validity ())
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 4679ef3e155..c8f09c69933 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -100,7 +100,6 @@ Driver::init (int argc, ACE_TCHAR **argv)
ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
this->objref_ = Param_Test::_narrow (temp.in());
-
}
catch (const CORBA::Exception& ex)
{
@@ -616,7 +615,6 @@ Driver::run (void)
this->objref_ = Param_Test::_nil ();
this->orb_->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index c53e30d5782..61f5c079118 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -106,7 +106,6 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Fixed_Array::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index ad71a5f7a03..15c7488bdca 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -106,7 +106,6 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Fixed_Struct::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 77402115ff3..c12b5d945c3 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -132,7 +132,6 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Nested_Struct::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 2bed0f53148..74dad5fa189 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -149,7 +149,6 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ObjRef::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 7f67712e794..188a7011a87 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -94,7 +94,6 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Objref_Struct::init_parameters\n");
-
}
return -1;
}
@@ -132,7 +131,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Objref_Struct::run_sii_test\n");
-
}
return -1;
}
@@ -176,7 +174,6 @@ Test_Objref_Struct::check_validity (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Objref_Struct::check_validity\n");
-
}
return 0;
}
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 83f03893c24..328bed47e5a 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -119,7 +119,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Recursive_Struct::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 3b19bc3033e..a6500e251e9 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -120,7 +120,6 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Recursive_Union::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 3cf8c0d1d84..f2b36b8d046 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -89,7 +89,6 @@ Test_Short::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Short::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index a1f64a7c57c..a3f799d1576 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -128,7 +128,6 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Small_Union::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 6dd0fa5e761..edad685cef6 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -119,7 +119,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_TypeCode::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index 07aab1ddf1c..f1e3064a337 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -198,7 +198,6 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_AnySeq::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index f899067802b..b6bc5487c9a 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -129,7 +129,6 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Array_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 21992565ad6..ace32631e54 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -109,7 +109,6 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Long_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index d57a08f8f92..a0984f2250a 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -110,7 +110,6 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ObjRef_Sequence::init_parameters\n");
-
}
return -1;
}
@@ -140,7 +139,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ObjRef_Sequence::run_sii_test\n");
-
}
return -1;
}
@@ -164,7 +162,6 @@ Test_ObjRef_Sequence::check_validity (void)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ObjRef_Sequence::check_validity");
-
}
return 0;
}
@@ -246,7 +243,6 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ObjRef_Sequence::compare");
-
}
return 0;
}
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 9138a7f0acf..c0d44106fe3 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -111,7 +111,6 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Short_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 918bba998e5..42059a4cc16 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -115,7 +115,6 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_String_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index a302f8c7036..c155a65bf85 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -127,7 +127,6 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 17d73b4423c..694796a5990 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -113,7 +113,6 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 5a8a760fa44..c2777d6a899 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -111,7 +111,6 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_WString_Sequence::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 2ac6eb0a5f7..0c29105ecc3 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -127,7 +127,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Unbounded_WString::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 6f17cb122cd..241323e65f2 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -86,7 +86,6 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_ULongLong::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 845bdeafa58..21b03d99ff2 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -104,7 +104,6 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Var_Array::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 5ff52e1d467..f574a260093 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -134,7 +134,6 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref)
catch (const CORBA::Exception& ex)
{
ex._tao_print_exception ("Test_Var_Struct::run_sii_test\n");
-
}
return -1;
}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
index 78f43124d85..4d413d9859a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
@@ -22,7 +22,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
server->shutdown ();
-
}
catch (const ::CORBA::Exception &ex)
{
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 9411f7c39d8..bd10a07913b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -135,7 +135,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
if (TAO_debug_level > 0 && i % 100 == 0)
ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-
}
marker.dump_stats (ACE_TEXT ("update records method "), gsf, 3);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index fb93e7ba264..948d7cbffa9 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -116,7 +116,6 @@ Echo_Client_Request_Interceptor::receive_reply (
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
paramlist[i].argument >>= param;
-
}
else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
{
@@ -218,7 +217,6 @@ Echo_Server_Request_Interceptor::receive_request (
ACE_DEBUG ((LM_DEBUG,
"The arg is %d\n",
param));
-
}
CORBA::String_var tmdi =
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 5249375a979..e42b70344ca 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -135,7 +135,6 @@ Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientReque
{
ACE_ERROR ((LM_ERROR,
"(%P|%t) All parameters not available\n"));
-
}
CORBA::ULong first = 0, second = 1; // If you dont understand
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index abb69742827..961fea9f416 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -154,7 +154,6 @@ Server_Request_Interceptor::send_exception (
this->request_count_ - 2));
throw PortableInterceptor::ForwardRequest (this->obj_[0]);
-
}
}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 908941bf9ac..c5c6b00ecc7 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -120,7 +120,6 @@ Echo_Client_Request_Interceptor::receive_reply (
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
paramlist[i].argument >>= param;
-
}
else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
{
@@ -228,7 +227,6 @@ Echo_Server_Request_Interceptor::receive_request (
ACE_DEBUG ((LM_DEBUG,
"The arg is %d\n",
param));
-
}
CORBA::String_var tmdi =
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 226dee9377a..911540c26a0 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -106,7 +106,6 @@ Echo_Client_Request_Interceptor::receive_reply (
CORBA::ULong i = 0; // index -- explicitly used to avoid
// overloaded operator ambiguity.
paramlist[i].argument >>= param;
-
}
else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
{
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 955feb9d110..4abd69de234 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -63,7 +63,6 @@ Echo_Server_Request_Interceptor::receive_request (
ACE_DEBUG ((LM_DEBUG,
"The arg is %d\n",
param));
-
}
CORBA::String_var tmdi =
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index c49fb047aea..ae3c8de8034 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -130,7 +130,6 @@ Client::create_widgets (/**/)
this->mainwindow_.setLayout(&box_);
-
}
void
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 18c3b4a3e72..8f9b685715f 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -131,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// We choose to run the main Qt event loop..
app.exec ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index 5cad7a83157..a98367c6f83 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -211,7 +211,6 @@ Task::svc (void)
ACE_DEBUG ((LM_DEBUG,
"Final priority of the servant thread"
" == its initial priority\n"));
-
}
catch (const ::CORBA::Exception & ex)
{
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index e3de89ef387..dade2a7d8d1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -211,7 +211,6 @@ Task::svc (void)
ACE_DEBUG ((LM_DEBUG,
"Final priority of the servant thread"
" = its initial priority\n"));
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index f1fb70b5967..6253d484e70 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -76,7 +76,6 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
my_mutex->unlock ();
rt_orb->destroy_mutex (my_mutex.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -321,7 +320,6 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
ACE_Thread_Manager::instance ()->wait ();
CORBA::release (mutex);
-
}
catch (const CORBA::Exception& ex)
{
@@ -443,7 +441,6 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
mutex->unlock ();
CORBA::release (mutex);
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 94011da03fe..1a580973dc6 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -125,7 +125,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// Testing over. Shut down Server ORB.
server1->shutdown ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index db1cdfe229d..346fb25315e 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -97,7 +97,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
server->two_way (ACE_TEXT_ALWAYS_CHAR(ior.c_str ()));
current->end_scheduling_segment (name);
-
}
catch (const CORBA::THREAD_CANCELLED& )
{
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index be462a69223..52ed109973a 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -104,8 +104,6 @@ Thread_Task::svc (void)
// End - Nested Scheduling Segment
this->current_->end_scheduling_segment (name);
-
-
}
catch (const CORBA::THREAD_CANCELLED& )
{
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 4c890461983..f57f9a70e15 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -69,7 +69,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
Foo_sequence u;
Foo_sequence v(u);
u = v;
-
}
catch (const ::CORBA::Exception &)
{
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index c0e49323d01..ff54e484019 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -116,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
// ACE_Time_Value tv (1);
// while (singleton->handle_events (&tv) >= 1);
-
}
// Handle events moved to here to prevent this test taking best part
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 9af4c84e1ce..b8974757c1e 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -15,7 +15,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
return proxy;
-
}
Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index de9a8c43400..8ec4f0bf503 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -45,7 +45,6 @@ class Marker
// get the sample.
this->throughput_.sample (throughput_diff,
latency_diff);
-
}
private:
/// Keep throughput statistics on a per-thread basis
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 6ea80855fc1..9b5a1e94d74 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -67,7 +67,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
return 0;
-
}
int
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index bcda296ad7f..47ae1744758 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -18,7 +18,6 @@ Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy
Smart_Diamond_Top_Proxy (proxy),
0);
return proxy;
-
}
Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index da799a02038..fc0bbd9672a 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
return proxy;
-
}
// The following Factory is used by the <ACE_Service_Config> to
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 4eb3378faa4..f287b8ec477 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
return proxy;
-
}
Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 097c5217a69..b8a035f4eab 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -18,7 +18,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
return proxy;
-
}
Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 25f130a5545..21f5d613490 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -50,7 +50,6 @@ Client_Task::validate_connections (void)
try
{
this->sender_->ping ();
-
}
catch (const CORBA::Exception&){}
}
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 530ac296313..99eac9cedc2 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -204,7 +204,6 @@ server_main (int argc,
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server (%P|%t) Invoking orb->destroy ()\n")));
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 9b5d225c9e3..875a435d594 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -73,7 +73,6 @@ namespace Test {
ACE_TEXT ("push_request_info: Can't track that many requests %d\n"),
name.in (),
requestID));
-
}
void
@@ -225,7 +224,6 @@ namespace Test {
}
Server_Request_Interceptor::receive_request_service_contexts (ri);
-
}
void
@@ -234,7 +232,6 @@ namespace Test {
try
{
outbound_process_context (ri);
-
}
catch (const CORBA::Exception&)
{
@@ -246,7 +243,6 @@ namespace Test {
}
Server_Request_Interceptor::send_reply (ri);
-
}
void
@@ -255,8 +251,6 @@ namespace Test {
try
{
outbound_process_context (ri);
-
-
}
catch (const CORBA::Exception&)
{
@@ -265,7 +259,6 @@ namespace Test {
ACE_TEXT("%C (%P|%t) Outbound_process_context failed in ")
ACE_TEXT("send_exception.\n"),
name.in ()));
-
}
Server_Request_Interceptor::send_exception (ri);
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 9133d91b07f..01942ade9e3 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -108,7 +108,6 @@ namespace Test
{
return !(this->operator== (ep));
};
-
} EndPoint;
private:
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index fbcecce3a26..56d431e9226 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -193,7 +193,6 @@ server_main (int argc,
server->shutdown ();
orb->destroy ();
-
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
index 77e6554d86c..1c81ed980bb 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
@@ -73,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
orb->destroy ();
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
index 27c5a224c32..7b3dce3e8bf 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
@@ -53,7 +53,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
orb->destroy ();
-
}
catch (const CORBA::Exception&)
{
diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp
index b3b030f123d..c0489e7329d 100644
--- a/TAO/utils/catior/Catior_i.cpp
+++ b/TAO/utils/catior/Catior_i.cpp
@@ -726,7 +726,6 @@ Catior_i::cat_tag_policies (TAO_InputCDR& stream) {
ACE_OS::snprintf (buf, bufsize,
"\t Priority: %d\n", server_priority);
buffer_ += buf;
-
} else if (policies[iter].ptype == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE) {
indent ();
ACE_OS::snprintf (buf, bufsize,
diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp
index fe3505a3d09..eb2f3294a1d 100644
--- a/TAO/utils/nsgroup/nsgroup.cpp
+++ b/TAO/utils/nsgroup/nsgroup.cpp
@@ -429,7 +429,6 @@ NSGROUP::parse_command_line (void)
ACE_OS::strlen (ACE_TEXT("member_remove"))) == 0 )
{
nsgroup_cmd_ = NSGROUP_MEMBER_REMOVE;
-
}
else if(ACE_OS::strncmp (this->argv_[i], ACE_TEXT("member_show"),
ACE_OS::strlen (ACE_TEXT("member_show"))) == 0 )
diff --git a/TAO/utils/wxNamingViewer/wxBindDialog.cpp b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
index f796661a7f5..6baafd53a19 100644
--- a/TAO/utils/wxNamingViewer/wxBindDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxBindDialog.cpp
@@ -100,7 +100,6 @@ WxBindDialog::WxBindDialog(
#endif // defined(wxUSE_RESOURCES) && (wxUSE_RESOURCES == 1)
if (isContext) {
SetTitle( "Bind Context");
-
} else {
SetTitle( "Bind Object");
}
@@ -145,11 +144,9 @@ bool WxBindDialog::TransferDataFromWindow()
name[0].kind = CORBA::string_dup( kind);
try {
object = orb->string_to_object( ior);
-
} catch(CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "Invalid IOR");
object = CORBA::Object::_nil();
-
}
return true;
}
diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
index af7288c1f9b..bbff234ff52 100644
--- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp
@@ -85,7 +85,6 @@ void WxNamingTree::clearChildren( void)
if (item) {
clearChildren( item);
Delete( item);
-
}
}
@@ -97,7 +96,6 @@ void WxNamingTree::clearChildren( wxTreeItemId& item)
clearChildren( child);
Delete( child);
child = GetFirstChild( item, cookie);
-
}
}
@@ -110,12 +108,10 @@ void WxNamingTree::copySelectedToClipboard()
if (wxTheClipboard->Open()) {
wxTheClipboard->SetData( new wxTextDataObject( ior));
wxTheClipboard->Close();
-
}
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -155,7 +151,6 @@ void WxNamingTree::listBindingList(
const wxString kind = static_cast<const char*>( (bl[i].binding_name[0]).kind);
if (!kind.IsNull()) {
name << " | " << kind;
-
}
wxTreeItemId contextItem = AppendItem( item, name);
SetItemData( contextItem, newObject);
@@ -164,20 +159,17 @@ void WxNamingTree::listBindingList(
// TODO: set a different icon for contexts
// TODO: set only if there are children
SetItemHasChildren( contextItem);
-
}
break;
case CosNaming::nobject:
break;
-
}
}
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -192,7 +184,6 @@ void WxNamingTree::listContext( wxTreeItemId& item)
CosNaming::NamingContext_var context = namingObject->NamingContext();
if (CORBA::is_nil( context.in ())) {
return;
-
}
// List the context's entries
@@ -211,17 +202,14 @@ void WxNamingTree::listContext( wxTreeItemId& item)
wxYES_NO | wxICON_QUESTION) == wxYES) {
bi->next_n( listQuantum, bl);
listBindingList( item, context.in(), bl);
-
}
}
bi->destroy();
-
}
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -235,14 +223,12 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event)
this));
if (dialog->ShowModal() != wxID_OK) {
return;
-
}
try {
WxNamingObject* object = getTreeObject();
CosNaming::NamingContext_var context = object->NamingContext();
if (CORBA::is_nil( context.in ())) {
return;
-
}
CosNaming::NamingContext_var newContext =
CosNaming::NamingContext::_narrow( dialog->getObject());
@@ -253,18 +239,15 @@ void WxNamingTree::onContextPopupBindContext( wxCommandEvent& event)
wxOK | wxICON_EXCLAMATION,
this);
return;
-
}
context->bind_context(
dialog->getName(),
newContext.in ());
onContextPopupRefresh( event);
-
} catch( CORBA::Exception& ex) {
wxMessageBox(
ex._rep_id(),
"CORBA::Exception");
-
}
}
@@ -277,7 +260,6 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event)
this));
if (dialog->ShowModal() != wxID_OK) {
return;
-
}
try {
wxTreeItemId item = GetSelection();
@@ -285,16 +267,13 @@ void WxNamingTree::onContextPopupBindObject( wxCommandEvent& event)
CosNaming::NamingContext_var context = object->NamingContext();
if (CORBA::is_nil( context.in ())) {
return;
-
}
context->bind( dialog->getName(), dialog->getObject());
onContextPopupRefresh( event);
-
} catch( CORBA::Exception& ex) {
wxMessageBox(
ex._rep_id(),
"CORBA::Exception");
-
}
}
@@ -306,23 +285,19 @@ void WxNamingTree::onContextPopupBindNewContext( wxCommandEvent& event)
CosNaming::NamingContext_var context = object->NamingContext();
if (CORBA::is_nil( context.in ())) {
return;
-
}
WxAutoDialog<WxBindNewContext> dialog( new WxBindNewContext( this));
if (dialog->ShowModal() != wxID_OK) {
return;
-
}
try {
CosNaming::NamingContext_var newContext = context->new_context();
context->bind_context( dialog->getName(), newContext.in ());
onContextPopupRefresh( event);
-
} catch( CORBA::Exception& ex) {
wxMessageBox(
ex._rep_id(),
"CORBA::Exception");
-
}
}
@@ -334,13 +309,11 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&)
"Confirm",
wxYES_NO | wxICON_QUESTION) != wxYES) {
return;
-
}
wxTreeItemId item = GetSelection();
wxTreeItemId parentItem = GetParent( item);
if (parentItem == 0) {
return;
-
}
WxNamingObject* object = getTreeObject( item);
WxNamingObject* parentObject = getTreeObject( parentItem);
@@ -354,10 +327,8 @@ void WxNamingTree::onContextPopupDestroy( wxCommandEvent&)
Delete( item);
// Do the unbind
parentNaming->unbind( object->Name());
-
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -377,13 +348,11 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&)
"Confirm",
wxYES_NO | wxICON_QUESTION) != wxYES) {
return;
-
}
wxTreeItemId item = GetSelection();
wxTreeItemId parentItem = GetParent( item);
if (parentItem == 0) {
return;
-
}
WxNamingObject* object = getTreeObject( item);
WxNamingObject* parent = getTreeObject( parentItem);
@@ -392,10 +361,8 @@ void WxNamingTree::onContextPopupUnbind( wxCommandEvent&)
context->unbind( object->Name());
clearChildren( item);
Delete( item);
-
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -406,7 +373,6 @@ void WxNamingTree::onItemExpanding( wxTreeEvent& event)
// If this item has a child it has already been listed so nothing to do.
if (GetLastChild( item) != wxTreeItemId( 0L)) {
return;
-
}
listContext( item);
}
@@ -434,7 +400,6 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& )
"Confirm",
wxYES_NO | wxICON_QUESTION) != wxYES) {
return;
-
}
wxTreeItemId item = GetSelection();
@@ -442,7 +407,6 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& )
wxTreeItemId parentItem = GetParent( item);
if (parentItem == 0) {
return;
-
}
WxNamingObject* object = getTreeObject( item);
WxNamingObject* parent = getTreeObject( parentItem);
@@ -451,10 +415,8 @@ void WxNamingTree::onObjectPopupUnbind( wxCommandEvent& )
context->unbind( object->Name());
clearChildren( item);
Delete( item);
-
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._rep_id(), "CORBA::Exception");
-
}
}
@@ -482,12 +444,10 @@ void WxNamingTree::onRMouseUClick( wxMouseEvent& event)
CosNaming::NamingContext_var context = object->NamingContext();
if (CORBA::is_nil( context.in ())) {
PopupMenu( objectPopup, event.m_x, event.m_y);
-
} else {
contextPopup->Enable( contextPopupDestroy, item != GetRootItem());
contextPopup->Enable( contextPopupUnbind, item != GetRootItem());
PopupMenu( contextPopup, event.m_x, event.m_y);
-
}
}
@@ -498,10 +458,8 @@ void WxNamingTree::resolve( CosNaming::NamingContext_ptr pRootContext)
wxTreeItemId item = AddRoot( "Root");
SetItemData( item, new WxNamingObject( pRootContext));
listContext( item);
-
} else {
AddRoot( "<null>");
-
}
}
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
index 2bad6ab022e..e9859892e31 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewerFrame.cpp
@@ -155,12 +155,10 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event))
server = selectNS->getServerName();
serverText->SetValue( server);
resolve();
-
} catch( CORBA::Exception const & ex) {
wxMessageBox(
ex._info().c_str(),
"CORBA::Exception");
-
}
break;
@@ -169,7 +167,6 @@ void WxNamingViewerFrame::onSelectNS( wxCommandEvent& WXUNUSED( event))
setDefaultNS();
resolve();
break;
-
}
}
diff --git a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
index d82aa923577..ca363fcfd1c 100644
--- a/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxSelectNSDialog.cpp
@@ -129,10 +129,8 @@ WxSelectNSDialog::WxSelectNSDialog( wxWindow* parent)
servers->Append(
name.c_str(),
new wxString( value.c_str()));
-
}
index++;
-
}
}
@@ -142,7 +140,6 @@ WxSelectNSDialog::~WxSelectNSDialog()
int count = servers->Number();
for (int i = 0; i < count; i++) {
delete static_cast<wxString*>( servers->GetClientData( i));
-
}
}
@@ -160,7 +157,6 @@ void WxSelectNSDialog::onAdd( wxCommandEvent& WXUNUSED(event))
section,
dialog->getServerName().c_str(),
value);
-
}
}
@@ -223,6 +219,5 @@ void WxSelectNSDialog::onRemove( wxCommandEvent& WXUNUSED(event))
ACE_Configuration_Section_Key section = config->root_section();
config->remove_value( section, name);
-
}
}
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index 41c14182cfd..f6ea0460cf5 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -169,7 +169,6 @@ WxViewIORDialog::WxViewIORDialog(
if (object != CORBA::Object::_nil()) {
WxViewIORDialog::object = CORBA::Object::_duplicate( object);
-
}
CORBA::String_var ior = orb->object_to_string( object);
WxViewIORDialog::ior = ior;
@@ -186,7 +185,6 @@ void WxViewIORDialog::decodeIOR()
typeID = "";
TransferDataToWindow();
return;
-
}
// Get the stub
@@ -207,10 +205,8 @@ void WxViewIORDialog::decodeIOR()
const_cast<TAO_Profile*>(profile)->to_string();
profiles->AppendItem( rootItem, profileString);
delete [] profileString;
-
} catch (const CORBA::Exception& ex) {
wxMessageBox( ex._info().c_str(), "CORBA::Exception");
-
}
}
@@ -224,7 +220,6 @@ void WxViewIORDialog::OnApply( wxCommandEvent& event)
try {
object = orb->string_to_object( ior);
decodeIOR();
-
} catch( CORBA::Exception& ex) {
wxMessageBox( ex._info().c_str(), "CORBA::Exception");
}
@@ -236,7 +231,6 @@ void WxViewIORDialog::onIORText( wxCommandEvent& event)
// Enable the Apply button if the IOR has changed
if (event.GetString() != ior) {
applyButton->Enable( true);
-
}
}